chore: merge from master

Author: dadiorchen

.env

@@ -0,0 +1,5 @@
+PORT=23101
+CACHE_SIZE=10000
+CACHE_EXPIRE=240000
+NODE_TLS_REJECT_UNAUTHORIZED='0'
+PG_POOL_SIZE=60

CHANGELOG.md

@@ -1,3 +1,176 @@
+## [4.17.2](https://github.com/Greenstand/node-mapnik-1/compare/v4.17.1...v4.17.2) (2021-05-06)
+
+
+### Bug Fixes
+
+* expand db pool to 20 ([8963d1c](https://github.com/Greenstand/node-mapnik-1/commit/8963d1c01ac91bd1ad52f96298704acbe910410c))
+
+## [4.17.1](https://github.com/Greenstand/node-mapnik-1/compare/v4.17.0...v4.17.1) (2021-05-06)
+
+
+### Bug Fixes
+
+* wrong settings ([bcc072b](https://github.com/Greenstand/node-mapnik-1/commit/bcc072bc0141913f0ed06a790c4015f1c08ebc70))
+
+# [4.17.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.16.1...v4.17.0) (2021-05-06)
+
+
+### Features
+
+* use new database for test env ([48c8590](https://github.com/Greenstand/node-mapnik-1/commit/48c8590ad2e1aa98f38ef00ab4830bc809d06421))
+
+## [4.16.1](https://github.com/Greenstand/node-mapnik-1/compare/v4.16.0...v4.16.1) (2021-05-06)
+
+
+### Bug Fixes
+
+* merge from master ([37d638a](https://github.com/Greenstand/node-mapnik-1/commit/37d638a4d7ca93f79bd2e37e4be9ce4975b51d28))
+* to fail the db ([9142c77](https://github.com/Greenstand/node-mapnik-1/commit/9142c7717f5439e978dd73574cffe7f4165fa800))
+
+# [4.16.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.15.0...v4.16.0) (2021-05-06)
+
+
+### Features
+
+* try new test db ([2412df6](https://github.com/Greenstand/node-mapnik-1/commit/2412df670ccf2e583278d233b74e8efd562699cf))
+
+# [4.15.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.14.1...v4.15.0) (2021-05-05)
+
+
+### Features
+
+* be able check version online ([e4d7bf5](https://github.com/Greenstand/node-mapnik-1/commit/e4d7bf5bc89fc89751177ce681cfccb2e499af02))
+
+## [4.14.1](https://github.com/Greenstand/node-mapnik-1/compare/v4.14.0...v4.14.1) (2021-05-05)
+
+
+### Bug Fixes
+
+* wrong setting ([a63517f](https://github.com/Greenstand/node-mapnik-1/commit/a63517f7218b002577628307b7a4b1de3e57f3d1))
+
+# [4.14.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.13.0...v4.14.0) (2021-05-05)
+
+
+### Bug Fixes
+
+* change back to calculate zoom target at zoom level range: 0-9; ([ca1577a](https://github.com/Greenstand/node-mapnik-1/commit/ca1577a7a14fd0d1b3592e325cec1321a2d4e240))
+
+
+### Features
+
+* add env var for pool size in development settings ([1b8e935](https://github.com/Greenstand/node-mapnik-1/commit/1b8e935f5f7c01fb4c5cc3f340e4b49469f8a9d5))
+* can use geojson for tree points; ([ec1284b](https://github.com/Greenstand/node-mapnik-1/commit/ec1284b659c251dc5ee1b681347a0cd4348f38c8))
+* let wallet/org/userid map use global data set ([5565d9c](https://github.com/Greenstand/node-mapnik-1/commit/5565d9c085384e97b8f84d009e75d4fd652cf7e1))
+
+# [4.13.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.12.2...v4.13.0) (2021-05-04)
+
+
+### Features
+
+* add env var for max pool size ([ee868b8](https://github.com/Greenstand/node-mapnik-1/commit/ee868b8b77e2adc044e933d4d8b73cecfa8e0088))
+* can use PGPool render all cluster, with bounds ([6c3e4f5](https://github.com/Greenstand/node-mapnik-1/commit/6c3e4f591e09cbc5681ebc4e2e5b3beff1dd3109))
+* pool is working ([e5f9763](https://github.com/Greenstand/node-mapnik-1/commit/e5f9763c77f837f14892cc35715a79986543911a))
+* refactor config with pool param ([30d4bac](https://github.com/Greenstand/node-mapnik-1/commit/30d4bacffa3069612cc72445a459e0eeabbe26cf))
+
+## [4.12.2](https://github.com/Greenstand/node-mapnik-1/compare/v4.12.1...v4.12.2) (2021-05-03)
+
+
+### Bug Fixes
+
+* bug in PGPool ([cd4067c](https://github.com/Greenstand/node-mapnik-1/commit/cd4067caf4a19d4678a286446a33d4a691b1706b))
+
+## [4.12.1](https://github.com/Greenstand/node-mapnik-1/compare/v4.12.0...v4.12.1) (2021-05-02)
+
+
+### Bug Fixes
+
+* update database connection string to use no-verify ([60b1e66](https://github.com/Greenstand/node-mapnik-1/commit/60b1e6668933aa9d3ddffb2873fdcc6224db5551))
+
+# [4.12.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.11.0...v4.12.0) (2021-04-30)
+
+
+### Features
+
+* neast version ([99c05f3](https://github.com/Greenstand/node-mapnik-1/commit/99c05f3666c42da130d1854c800ed798504856f5))
+
+# [4.11.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.10.2...v4.11.0) (2021-04-30)
+
+
+### Features
+
+* add dotenv ([e8828ce](https://github.com/Greenstand/node-mapnik-1/commit/e8828ce5151b9291e8ea1732cb7484bb20219195))
+* add LRU ([db45e88](https://github.com/Greenstand/node-mapnik-1/commit/db45e88119d05aa1790f537f60aee54a501ca801))
+* can compose the geojson by result got from DB ([66fa47f](https://github.com/Greenstand/node-mapnik-1/commit/66fa47f84f1d57b7bbe6d226624cd3d8a7deb7dd))
+* can render all layers; now is caching xml config string ([27026e2](https://github.com/Greenstand/node-mapnik-1/commit/27026e2ace9bf4a3572989fc1254fc49fc27ebd2))
+* can render by json, just restore the previous way to render it by load xml, and inline json data ([8326783](https://github.com/Greenstand/node-mapnik-1/commit/8326783c3b42425d0d40063cb6e15521ce321bc6))
+* can render png on zoom level 2 ([6bfa46e](https://github.com/Greenstand/node-mapnik-1/commit/6bfa46e826a21504236bf699ac64157a8c9e6602))
+* pgPool; can render png, json ([ff109d9](https://github.com/Greenstand/node-mapnik-1/commit/ff109d9f530ec3301cbc9577cec3113a42065710))
+
+## [4.10.2](https://github.com/Greenstand/node-mapnik-1/compare/v4.10.1...v4.10.2) (2021-04-28)
+
+
+### Bug Fixes
+
+* scale test env to 4 replicas ([52304d2](https://github.com/Greenstand/node-mapnik-1/commit/52304d26bfbc183adcadfe362100c896f340b928))
+* scale test env to 4 replicas ([d82dd60](https://github.com/Greenstand/node-mapnik-1/commit/d82dd608caca32fa464f11857d340c7835c99f89))
+* update mapping to remove timeout for prod ([02926e8](https://github.com/Greenstand/node-mapnik-1/commit/02926e8e52d8b67c457e8f27ec960ec8f552f1ec))
+
+## [4.10.1](https://github.com/Greenstand/node-mapnik-1/compare/v4.10.0...v4.10.1) (2021-04-26)
+
+
+### Bug Fixes
+
+* change port back to 3000 ([e89f5b9](https://github.com/Greenstand/node-mapnik-1/commit/e89f5b9fcf46b7989345e8976c09b1c7b7a6d092))
+
+# [4.10.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.9.1...v4.10.0) (2021-04-24)
+
+
+### Bug Fixes
+
+* clip ([7e33b9a](https://github.com/Greenstand/node-mapnik-1/commit/7e33b9ac35912091938c61622400c247781f2239))
+* edit sql with bounds which considers buffer ([cd6274c](https://github.com/Greenstand/node-mapnik-1/commit/cd6274c6a16df1a16895253cd888a28130f99fba))
+* typo ([e00a91d](https://github.com/Greenstand/node-mapnik-1/commit/e00a91d69ff94f4ac37f0e2dcea85d28ad6e3168))
+* wrong image icon path ([fab424a](https://github.com/Greenstand/node-mapnik-1/commit/fab424ac4a494ace7356997b2f98ed965e33b1d4))
+
+
+### Features
+
+* add bounds to sql ([f1db6ee](https://github.com/Greenstand/node-mapnik-1/commit/f1db6ee888987542009c4d7682095e7d6d955d6c))
+
+## [4.9.1](https://github.com/Greenstand/node-mapnik-1/compare/v4.9.0...v4.9.1) (2021-04-18)
+
+
+### Bug Fixes
+
+* force release ([581bbea](https://github.com/Greenstand/node-mapnik-1/commit/581bbea12e93431af614196a6f50514c8605d129))
+
+# [4.9.0](https://github.com/Greenstand/node-mapnik-1/compare/v4.8.10...v4.9.0) (2021-04-16)
+
+
+### Bug Fixes
+
+* break on wallet tree layer ([7a44b21](https://github.com/Greenstand/node-mapnik-1/commit/7a44b21adaf63c2de0785770246eb5663a78e650))
+
+
+### Features
+
+* basic xml config ([e446599](https://github.com/Greenstand/node-mapnik-1/commit/e44659917a9444ec4f7c341052f5e44d86da2680))
+* building xmlString move to config.js ([cde0ea1](https://github.com/Greenstand/node-mapnik-1/commit/cde0ea1708eb37244e93f957eb576ca56bddac46))
+* can add zoom target ([3cd3e08](https://github.com/Greenstand/node-mapnik-1/commit/3cd3e089fbebce27dbafd175313a2dbbf10cdc99))
+* can display all level for normal map ([22cae28](https://github.com/Greenstand/node-mapnik-1/commit/22cae288b0f3b87151603138e8e241c917a580f4))
+* can format number with 'K', can display bigger circle ([2d76fc1](https://github.com/Greenstand/node-mapnik-1/commit/2d76fc18a81b6223465de2c0a4f05ab41cf58976))
+* can load setting by map/sql model ([1b71d29](https://github.com/Greenstand/node-mapnik-1/commit/1b71d29ee6d99ddc2bcb3aa237bee2f91766a519))
+* can read config from string ([ccc5447](https://github.com/Greenstand/node-mapnik-1/commit/ccc5447d14bc67bf5543e6ae8c4a8aa0b6a416b3))
+* can render cluster ([dc9c2fb](https://github.com/Greenstand/node-mapnik-1/commit/dc9c2fbd9ec047c65b1ae48824c93455a8a2e9cc))
+* can render number on cluster icon ([5f9629c](https://github.com/Greenstand/node-mapnik-1/commit/5f9629cd75e72c646d2a73b40419ea667959a265))
+* can render org tile ([96ac2b2](https://github.com/Greenstand/node-mapnik-1/commit/96ac2b2f81f96f6013abdeb81e512448280c6af9))
+* can return zoom_to ([ef5fa24](https://github.com/Greenstand/node-mapnik-1/commit/ef5fa24988768c0f3ccc85158207cacf6cbfcb94))
+* font improvment; ([3224a87](https://github.com/Greenstand/node-mapnik-1/commit/3224a87fe29176dd149b795c273af36562badafb))
+* font test passed ([aa6fc31](https://github.com/Greenstand/node-mapnik-1/commit/aa6fc31a2ab9bc77a4af67d657b5c15d8c346222))
+* now can display tree point with correct icon ([0fbcc5d](https://github.com/Greenstand/node-mapnik-1/commit/0fbcc5dd1f97638c6006c06da739600ff12df878))
+* use shieldsymbol to display icon; ([a9cac85](https://github.com/Greenstand/node-mapnik-1/commit/a9cac85317e5c3da65ee4cb15a7e9fac3631b5f6))
+* zoom target support org map ([86fcb45](https://github.com/Greenstand/node-mapnik-1/commit/86fcb45c40df5f518053cabd30d7bb7e25d2fba9))
+
 ## [4.8.10](https://github.com/Greenstand/node-mapnik-1/compare/v4.8.9...v4.8.10) (2021-04-01)
 
 

README.md

@@ -1,7 +1,7 @@
 # node-mapnik
 
 Bindings to [Mapnik](http://mapnik.org) for [node](http://nodejs.org).
-
+ 
 [![NPM](https://nodei.co/npm/mapnik.png?downloads=true&downloadRank=true)](https://nodei.co/npm/mapnik/)
 
 [![Build Status](https://secure.travis-ci.org/mapnik/node-mapnik.png)](https://travis-ci.org/mapnik/node-mapnik)

deployment/base/deployment.yaml

@@ -20,6 +20,16 @@ spec:
           ports:
             - containerPort: 80
           env:
+            - name: PORT
+              value: "3000"
+            - name: PG_POOL_SIZE
+              value: "20"
+            - name: CACHE_SIZE
+              value: "10000"
+            - name: CACHE_EXPIRE
+              value: "240000"
+            - name: NODE_TLS_REJECT_UNAUTHORIZED
+              value: "0"
             - name: DB_URL
               valueFrom:
                 secretKeyRef:

deployment/base/mapping.yaml

@@ -6,3 +6,4 @@ spec:
   prefix: /tiles/
   service: treetracker-tile-server
   rewrite: /
+  timeout_ms: 60000

deployment/overlays/production/mapping.yaml

@@ -3,6 +3,7 @@ kind: Mapping
 metadata:
   name: treetracker-tile-server
 spec:
+  timeout_ms: 0
   cors:
     origins:
       - https://prod-k8s.treetracker.org

deployment/overlays/test/database-connection-sealed-secret.yaml

@@ -6,7 +6,7 @@ metadata:
   namespace: tile-server
 spec:
   encryptedData:
-    db: AgAUqugu+tJkvVgvTRL/AcXKv62rGuUrfI4fi5yCtM0wsPdLndZLTQrg3iFRadp/EHMAi4sl/rVHL/GnRNQaxnaTvLaI/vlKop+fjtozbGh2CneLPxBWU6SKtRBujFEQPn1Gn7xu0oVMA7jGv0uVbcInCbD6LF4hcPZX/gTKcoPiaX6XDfPlaWJekmmLd2gBEww/Oh4l8lnvi296v8eBU+bRyavOP9sf7/PdSD2svbQ2sSUgnXm9+H3Fvm+JoGsqfXNplQIioIdk4ddIif+E/gjQzqLvj2IPmUE49qd3BZd4Zh8aeV3vCOhIx0ngfkm0chr89QZT92bfiY7F8wgAOPX2CgPFX+KSeTNOmbYmyfRy0z0Qt+Ty/LqXAvFhpxF9yQjQv1y3kfAss2NnyVQe79Jo0f5TJdtaBYrt5pHGbdOlU5Go0j7xecqPLin+93spImqHsA9YdnuTzDRk7EcsAqMtlrEyJWdeIydnus9naG9ln2z9zKl/I52wHI+l9aV6F3xgRbUFmVtVk60wkK7z64eFMUoAAKu3zIilfQ3ECEZxOcIpdtHyB3Fmodv7DwAfw0I+ygvtTM6DR6NDSiKUkGy932H2bPD4ATb2KID7uzb30RRRXW4qeiGeBcFF4U1ugPxRIEFe9bDCMk7zhGP+CPIYkP3qLXKd73Len3Qf8mEWAmWqVOF4smjSrDInK+T2as6CT4nCMHEu1oy9pCI4RiQNzEPtGNVVAOcTZIALDJtCRLyTkawNpshO2dRPFTBElTf88p5pmkx5yzhPxt529Xn5DmExo5P4noD0Ma7ff0G/M1sNKLV0Xp3U5DX+zxia2iRzjUQVHgOa2SZ5dC0Tt0cJEv9YjUCWGXoDJDEBSEGydLnsd13l
+    db: AgCykMKppVZ72aOmhvelDJYLJ+QilzFabTKpQ9j6j11bSO0ViQ+hbL1R//d2hUckddV3+NClf+DspUnxv68W2J5/hyoCtq9a1JDuhUHZpuvRI9109ADsCk3XtbZVDc86d8CyGsF6gi4hbNAUWSrHWIUHjQQsnnorX+huUHoE2N/r1PZvoyHdbRkDrRE0EfVLfmRC3cCqXP2hr0q/W3vuTlDNatgAkrZJ6haeKHBCgFcJOdxb10EDAZJd3U1/lScA6C2jRSuEf8VDPjfYOH0xvTxvhewgyt9F6XF2q9SC4PoG7yewQQbLbr0mEyOnNCc0i3bNInhirLYRaoCVgVj7Ud3eqkTa8wuz4LDYN/+BR04HCN/fNX3iCSotwYnOzeJ0r9HvGicgs7VGYo6L2CkWmYMsOM50Ce08QAbE5mLWtvL7Bg6mkwaBw4t98Fz+JwuyetpvfYbiwPRWPPaEsJrOpjNMjJccpb/azwjayXxcKp4KK/sQluvfT1NcDbD/ByuyNhzBn2rkXVTlbola4rp+1awKpDehMF5pWPJ/s81knEBZ1AUqxIpvBYagjLFSHJT/0ywyYjtZ0Bd3lbu+cEeR5GJH9E84t/G9xJDkOiyclyS4NaguvfDRPdR+5a6Ua1LUwqfPVGnCkBsGxDpQpfE9+tGLjfcRooj0IVx7WKaZkUCuUCcbjhFeGJQ7w9tmR/G9XXBuBhf89ynorYPzBXOzjpYqVMeMQECM67dAxqe0ofW9SHmdxFU2Rk32wNLhiVxVOgwed2Q9x02keg9VxfUjm6vyn3EPpSklDSBaILTGirIM6wrU54Ydaj/BO2zUapWX7QlLTrF5IaKSaINOrlGGFVvzisqnI5YFm+HSvKkJjI2Zs74umKWSilw=
   template:
     metadata:
       creationTimestamp: null

deployment/overlays/test/deployment.yaml

@@ -0,0 +1,8 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: treetracker-tile-server
+  labels:
+    app: treetracker-tile-server
+spec:
+  replicas: 4

deployment/overlays/test/kustomization.yaml

@@ -3,3 +3,4 @@ bases:
 patchesStrategicMerge:
   - mapping.yaml
   - database-connection-sealed-secret.yaml
+  - deployment.yaml