From 0a7c403f0b98200275faf6bdde879181411fd0c2 Mon Sep 17 00:00:00 2001 From: Petr Sloup Date: Mon, 30 Dec 2019 11:56:53 +0100 Subject: [PATCH] Update repo links, footnote, etc. (klokantech->maptiler) --- .travis.yml | 2 +- Dockerfile | 1 - Dockerfile_light | 1 - Dockerfile_test | 3 +- README.md | 2 +- README_light.md | 4 +- package.json | 5 +- public/resources/images/klokantech.png | Bin 2657 -> 0 bytes public/resources/images/maptiler-logo.svg | 67 ++++++++++++++++++++++ public/resources/index.css | 4 +- public/templates/index.tmpl | 4 +- 11 files changed, 77 insertions(+), 16 deletions(-) delete mode 100644 public/resources/images/klokantech.png create mode 100644 public/resources/images/maptiler-logo.svg diff --git a/.travis.yml b/.travis.yml index 2820e39..2977d12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ before_install: - sudo apt-get install -qq xvfb libgles2-mesa-dev libgbm-dev libxxf86vm-dev install: - npm install - - wget -O test_data.zip https://github.com/klokantech/tileserver-gl/releases/download/v1.3.0/test_data.zip + - wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip - unzip -q test_data.zip -d test_data script: - xvfb-run --server-args="-screen 0 1024x768x24" npm test diff --git a/Dockerfile b/Dockerfile index b82ff8f..490749d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ FROM node:10-stretch -MAINTAINER Petr Sloup ENV NODE_ENV="production" VOLUME /data diff --git a/Dockerfile_light b/Dockerfile_light index dafbdd2..3312543 100644 --- a/Dockerfile_light +++ b/Dockerfile_light @@ -1,5 +1,4 @@ FROM node:10-stretch -MAINTAINER Petr Sloup ENV NODE_ENV="production" EXPOSE 80 diff --git a/Dockerfile_test b/Dockerfile_test index d1f2b25..37d34f8 100644 --- a/Dockerfile_test +++ b/Dockerfile_test @@ -3,7 +3,6 @@ # WARNING: sometimes it fails with a core dumped exception FROM node:10-stretch -MAINTAINER Petr Sloup RUN apt-get -qq update \ && DEBIAN_FRONTEND=noninteractive apt-get -y install \ @@ -24,7 +23,7 @@ RUN apt-get -qq update \ RUN mkdir -p /usr/src/app WORKDIR /usr/src/app -RUN wget -O test_data.zip https://github.com/klokantech/tileserver-gl/releases/download/v1.3.0/test_data.zip +RUN wget -O test_data.zip https://github.com/maptiler/tileserver-gl/releases/download/v1.3.0/test_data.zip RUN unzip -q test_data.zip -d test_data ENV NODE_ENV="test" diff --git a/README.md b/README.md index 7543105..8dd163d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # TileServer GL -[![Build Status](https://travis-ci.org/klokantech/tileserver-gl.svg?branch=master)](https://travis-ci.org/klokantech/tileserver-gl) +[![Build Status](https://travis-ci.org/maptiler/tileserver-gl.svg?branch=master)](https://travis-ci.org/maptiler/tileserver-gl) [![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/klokantech/tileserver-gl/) Vector and raster maps with GL styles. Server side rendering by Mapbox GL Native. Map tile server for Mapbox GL JS, Android, iOS, Leaflet, OpenLayers, GIS via WMTS, etc. diff --git a/README_light.md b/README_light.md index f31745d..b8df587 100644 --- a/README_light.md +++ b/README_light.md @@ -1,5 +1,5 @@ # TileServer GL light -[![Build Status](https://travis-ci.org/klokantech/tileserver-gl.svg?branch=master)](https://travis-ci.org/klokantech/tileserver-gl) +[![Build Status](https://travis-ci.org/maptiler/tileserver-gl.svg?branch=master)](https://travis-ci.org/maptiler/tileserver-gl) [![Docker Hub](https://img.shields.io/badge/docker-hub-blue.svg)](https://hub.docker.com/r/klokantech/tileserver-gl/) Vector maps with GL styles. Map tile server for Mapbox Android, iOS, GL JS, Leaflet, OpenLayers, etc. without server side rendering. @@ -11,7 +11,7 @@ Then you can simply run `tileserver-gl-light zurich_switzerland.mbtiles` to star See also `tileserver-gl` which contains server side rendering. -Prepared vector tiles can be downloaded from [OSM2VectorTiles](http://osm2vectortiles.org/). +Prepared vector tiles can be downloaded from [OpenMapTiles](https://openmaptiles.org/downloads/). ## Documentation You can read full documentation of this project at http://tileserver.readthedocs.io/. \ No newline at end of file diff --git a/package.json b/package.json index 4261f01..f84aab9 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,9 @@ "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles", "main": "src/main.js", "bin": "src/main.js", - "authors": [ - "Petr Sloup " - ], "repository": { "type": "git", - "url": "https://github.com/klokantech/tileserver-gl.git" + "url": "https://github.com/maptiler/tileserver-gl.git" }, "license": "BSD-2-Clause", "engines": { diff --git a/public/resources/images/klokantech.png b/public/resources/images/klokantech.png deleted file mode 100644 index 097df7b45394cae7a0432f1efab6d9331c3c961a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2657 zcmXX|3pkW%8-7I$W6TVL92zrY7{)QDsN@_&&SVTLh7^tD7$RelLkCtQf04zI!Y(?Y zcC8w=Flb9t4sAAUh}2Sw?EB5XbA9t3p7(z5`+lD1yRMl6FAryojH(O(0K;%`^nvpN z{Mw3(K>)yLBBQ(}z-S|1qLjE&`K*JT!z&*$~l!4^|riL;rYq1eqxSkdVXy6{x}^xb+8E3L-?%0XUui z)D`srMh6LE$Ou171gHQ!#M2Q`gbjjW>0oy7E)}T3t*A;+OBSXHFG4K{5Mdw^XAFQX zkP#IDMgA{en5MKgfJK1yhdj^>l!I-8w`4SsfvsOGa!!5(tKkgFS*;D&xg4}{ZMVK#1 zlsN2;ND=yhZ16f>PxQ7x|1_imcuIkOsV8iWAkoLe7o?&|REpT{E!%ZWlrdPvolz(3 zQlva$P((GEATJxat>*Lt_~UqKC3RE(grl)+ZOt7K9F`;|Dc(LNT4HOWY_iO@KnrmO zIZSe2vPzOFnTC$DJrrVWc=$MKmlQ!u{79%aiRmn>aERtdm)Rq~C)B_@z|2a)=9r7_ z!30-_NF$ttNuY+RQ?Q!8p`)uc&Qaxvm77nZbcjJ@Y+Ml2$oxCPAz$}nT6?|qVs-Qm zhI4#%^>=CP_44+JcW@5dren?8Z@J&ihiGfD+mk49K4ym|Of{GjVJ5{K#pg#hft1b{m_B z$iXVcOxN>!OA;g7WF@nI3pGY2yOW13H5m_>FB=|NE^?(ORWi2H)7&IcMEvuWzJr7I@cP4Ja0q{{Qsz zq7DZy|Hk~|#$Hs1;G&j=_3g*j=UTCoGavQWYK?O7yZU<1f1vlY&ZpLH@1B~zDZw7v zRb+SV&ybdYR=1QBU)b-QuAHr03ulj=N!C=qVP5}J?msL>VLf~MJ-N60{FD31ia{ya z)_*AO_UV_78(cf`*9Xs##|}*SrHalSOU-+<@1H#KfXQqO_Eyof|&)N?>e% zS-!Ap*o`scZ{Gf3LGsV)DOOY8OnpFxwR!9DK7U?d&3NoLvT{<)M#5Tf?Kawh1B2+k z$mbhMg}0loG5AwdQ?8%D^zz`N^n*ow&$pM`Dw@w58NB??SeRQJ++WF-9Qd^gMTk#N zn%{A%sriEewwtC+R<2!FsY~m%EBfxEKM%u~A_-kB-nO=#qAUA3&v|t2{SY&@`^%Ak z-gK#{+*}yvVC>x$`$mRe70y2F5nKRe*y@dQUCr~4GxVQsX-&y~lpJz8G0!TCIaaSb z*~@rUN1PP)RC{`6#y|a{`u)9$7}>7!ioXxe{_aK!UKVWlKrUVplR1 zmcno->1gFZ=f?EytP+Wh+;Z)!bm8MN zZbduyFTdo_9G>z4eda_Svypb6J3F#Rtt!0o1?NpRUT4zBACs3C|p|)VaEh9WERit48zFs_#v5FMYU>e)QEQA!tq4 zzPDG9k-#`d{7O`|`$RL8<45jL?(B694mas7uzr-A&r2l;)JL=xf)0j`s<%UMJX2&PY zIx3nQlCD&^Zym+xUuX?^9;VabREFZW$O>x8K8*x_H6SEdj%NQ{?v$yYvF!x6$1C$m z1pBDK?0=+%HRn>M`s>SPViW5$i6HXf-0+wiEJ-re|Nh)o!Scc4xvK>$t74W;dh7we zI3c6+TcvRp^JI+|MnB%1kSM(1#yam*;6yvbS&b*Q%~Z}!Z~tBBRA6tR{_&{I(BDkU zR~@Ks-gLT8)t!zDuZ38J+(^#Llpn(r{*vCw9?Ezl@ksE4axdLkY`vkxK9*R+AH8P~ zK9YDWKZ3E_zDlc(> z{X*(>4IdNL?_S;CCSLO33Ga^Zxy>*s)xedK^UiwuEAGuNtVM3$lwCca`m5ja7FNhw ysB(SbCXR8qI(cR+ZgVURTYu@lUmnr4xwZI;_P&=Z@@>dJD~6MYV~c(0_x}POvC{eg diff --git a/public/resources/images/maptiler-logo.svg b/public/resources/images/maptiler-logo.svg new file mode 100644 index 0000000..fcb4a96 --- /dev/null +++ b/public/resources/images/maptiler-logo.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/resources/index.css b/public/resources/index.css index 1fa5799..e32c9f9 100644 --- a/public/resources/index.css +++ b/public/resources/index.css @@ -135,8 +135,8 @@ footer { font-size:12px; } footer img { - width: 118px; - height: 32px; + width: 113px; + height: 31px; } footer .t { display:none; diff --git a/public/templates/index.tmpl b/public/templates/index.tmpl index 191496d..603f2eb 100644 --- a/public/templates/index.tmpl +++ b/public/templates/index.tmpl @@ -104,9 +104,9 @@ {{/if}}