From 94266f4669496dd09dad49070eba759e5a952350 Mon Sep 17 00:00:00 2001 From: sorodrigo Date: Wed, 18 Dec 2019 16:25:33 +0100 Subject: [PATCH 1/2] move robots.txt to frontend --- {public => frontend/public}/robots.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {public => frontend/public}/robots.txt (100%) diff --git a/public/robots.txt b/frontend/public/robots.txt similarity index 100% rename from public/robots.txt rename to frontend/public/robots.txt From d74022ca766f671fc176c91afa0500336484991d Mon Sep 17 00:00:00 2001 From: sorodrigo Date: Thu, 19 Dec 2019 10:36:12 +0100 Subject: [PATCH 2/2] updates production contextual layers --- .../cartodb/tool/templates.production.json | 84 +++++++++++++++++++ .../named-maps/tool_named_maps_carto.js | 38 +++++++-- 2 files changed, 113 insertions(+), 9 deletions(-) diff --git a/frontend/gis/cartodb/tool/templates.production.json b/frontend/gis/cartodb/tool/templates.production.json index ee3a5c09fa..580b1d78ea 100644 --- a/frontend/gis/cartodb/tool/templates.production.json +++ b/frontend/gis/cartodb/tool/templates.production.json @@ -206,5 +206,89 @@ } ] } + }, + { + "version": "0.0.1", + "name": "ar_province_mainland_20191122", + "layergroup": { + "version": "1.0.1", + "layers": [ + { + "type": "cartodb", + "options": { + "sql": "SELECT * FROM \"p2cs-sei\".ar_province_mainland_20191122", + "cartocss": "#layer { polygon-opacity: 0; line-color: #000000; line-width: 1; line-opacity: 1; } #layer[zoom > 3]::labels { text-name: [prov_name]; text-face-name: 'Open Sans Regular'; text-size: 10; text-fill: #000000; text-halo-fill: white; text-halo-radius: 1; text-character-spacing: 3; text-placement: point; text-allow-overlap: false; text-wrap-width: 45; }", + "cartocss_version": "2.3.0" + } + } + ] + } + }, + { + "version": "0.0.1", + "name": "ar_biomes_20191113", + "layergroup": { + "version": "1.0.1", + "layers": [ + { + "type": "cartodb", + "options": { + "sql": "SELECT * FROM \"p2cs-sei\".ar_biomes_20191113", + "cartocss": "#layer { polygon-opacity: 0; line-color: #000000; line-width: 0.5; line-opacity: 1; } #layer[zoom > 3]::labels { text-name: [biome_name]; text-face-name: 'Open Sans Regular'; text-size: 10; text-fill: #000000; text-allow-overlap: false; text-placement: interior; text-halo-fill: white; text-halo-radius: 0.7; text-character-spacing: 3; } ", + "cartocss_version": "2.3.0" + } + } + ] + } + },{ + "version": "0.0.1", + "name": "argentina_protected_areas_20191117", + "layergroup": { + "version": "1.0.1", + "layers": [ + { + "type": "cartodb", + "options": { + "sql": "SELECT * FROM \"p2cs-sei\".argentina_protected_areas_20191117", + "cartocss": "#layer { polygon-opacity: 0.5; polygon-fill: ramp([type], (#8dd3c7, #ffffb3, #bebada, #fb8072, #80b1d3, #fdb462, #b3de69), (\"National Protected Areas\", \"National Defense Reservers\", \"Ramsar\", \"Natural World Heritage Sites\", \"Provincial Protected Areas\", \"Biosphere Reserves\"), \"=\"); line-color: ramp([type], (#8dd3c7, #ffffb3, #bebada, #fb8072, #80b1d3, #fdb462, #b3de69), (\"National Protected Areas\", \"National Defense Reservers\", \"Ramsar\", \"Natural World Heritage Sites\", \"Provincial Protected Areas\", \"Biosphere Reserves\"), \"=\"); line-width: 1; line-opacity: 1; }", + "cartocss_version": "2.3.0" + } + } + ] + } +}, + { + "version": "0.0.1", + "name": "argentina_deforestation_2015_2017_20191128", + "layergroup": { + "version": "1.0.1", + "layers": [ + { + "type": "cartodb", + "options": { + "sql": "SELECT * FROM \"p2cs-sei\".argentina_deforestation_2015_2017_20191128", + "cartocss": "#layer { polygon-opacity: 0.8; line-width: 0.2; line-opacity: 1; [year = 2015] { polygon-fill: #f7945d; line-color: #f7945d; } [year = 2016] { polygon-fill: #f86f56; line-color: #f86f56; } [year = 2017] { polygon-fill: #ee4d5a; line-color: #ee4d5a; } }", + "cartocss_version": "2.3.0" + } + } + ] + } + }, + { + "version": "0.0.1", + "name": "id_provinces", + "layergroup": { + "version": "1.0.1", + "layers": [ + { + "type": "cartodb", + "options": { + "sql": "SELECT * FROM indonesia_provinces_boundaries_20190614", + "cartocss": "#layer { polygon-opacity: 0; line-color: #000000; line-width: 1; line-opacity: 1; ::outline { line-color: #FFFFFF; line-width: 1; line-opacity: 0.5; } [zoom>4]::labels { text-face-name: 'Open Sans Regular'; text-name: [prov]; text-size: 12; text-allow-overlap: true; text-placement: point; text-fill: #000000; text-character-spacing: 0; [prov='SULAWESI UTARA'] { text-dy: -10; } [prov='BENGKULU'] { text-dy: 10; } [prov='SULAWESI TENGGARA'] { text-dy: 10; } [prov='BANTEN'] { text-dx: -10; } [prov='DKI JAKARTA'] { text-dy: -10; } [prov='JAWA BARAT'] { text-dy: -10; } [prov='JAWA TIMUR'] { text-dx: 10; text-dy: -10; } [prov='NUSA TENGGARA BARAT'] { text-dy: 10; } [prov='NUSA TENGGARA TIMUR'] { text-dx: 5; } } } ", + "cartocss_version": "2.3.0" + } + } + ] + } } ] diff --git a/frontend/scripts/named-maps/tool_named_maps_carto.js b/frontend/scripts/named-maps/tool_named_maps_carto.js index 9ade7099bf..5542bef659 100644 --- a/frontend/scripts/named-maps/tool_named_maps_carto.js +++ b/frontend/scripts/named-maps/tool_named_maps_carto.js @@ -5,6 +5,10 @@ module.exports = { uid: 'brazil_states__production', layergroupid: 'p2cs-sei@4f456911@94bb9db1cc2bbb6f823b52891ea85a4b:1536754740910' }, + brazil_biomes: { + uid: 'brazil_biomes__production', + layergroupid: 'p2cs-sei@ee8b4bf2@53eff313f97bb4d6e956f5078a2ce178:1536754747512' + }, brazil_water_scarcity: { uid: 'brazil_water_scarcity__production', layergroupid: 'p2cs-sei@ce96a651@bd75df185965352f558793d64c6c76af:1536754755124' @@ -21,10 +25,18 @@ module.exports = { uid: 'brazil_defor_alerts__production', layergroupid: 'p2cs-sei@c4807a94@9495c323e40ff63e0c59e0fc6ffbebcd:1538401614852' }, + paraguay_ecoregions_2018_11_14: { + uid: 'paraguay_ecoregions_2018_11_14__production', + layergroupid: 'p2cs-sei@8bc16e3e@920a70ce8cd9698d474541a13571868e:1543380503816' + }, paraguay_protected_areas_2018_11_14: { uid: 'paraguay_protected_areas_2018_11_14__production', layergroupid: 'p2cs-sei@7fb7d231@e3a7e457c532b2340f2fa76d05c84160:1542212474275' }, + paraguay_indigenous_areas_2018_11_14: { + uid: 'paraguay_indigenous_areas_2018_11_14__production', + layergroupid: 'p2cs-sei@93c53b34@286bbb73f3bcdfa206205acef80ec835:1542212565695' + }, py_deforestation_2013_2017_20190131: { uid: 'py_deforestation_2013_2017_20190131__production', layergroupid: 'p2cs-sei@9d6ad933@07588ca1af7caf72f3f838cdac1cac8f:1548926222884' @@ -37,17 +49,25 @@ module.exports = { uid: 'colombia_protected_areas__production', layergroupid: 'p2cs-sei@bd5844b5@7068763bcb727c705c489c838b6deadb:1536312121956' }, - brazil_biomes: { - uid: 'brazil_biomes__production', - layergroupid: 'p2cs-sei@ee8b4bf2@53eff313f97bb4d6e956f5078a2ce178:1536754747512' + ar_province_mainland_20191122: { + uid: 'ar_province_mainland_20191122__production', + layergroupid: 'p2cs-sei@e0297422@4ebef4e2c77f2449b6f41d819980fc49:1575027012669' }, - paraguay_ecoregions_2018_11_14: { - uid: 'paraguay_ecoregions_2018_11_14__production', - layergroupid: 'p2cs-sei@8bc16e3e@920a70ce8cd9698d474541a13571868e:1543380503816' + ar_biomes_20191113: { + uid: 'ar_biomes_20191113__production', + layergroupid: 'p2cs-sei@1e6ce145@8fa69e383af12b167092f6168311e13b:1573645666401' }, - paraguay_indigenous_areas_2018_11_14: { - uid: 'paraguay_indigenous_areas_2018_11_14__production', - layergroupid: 'p2cs-sei@93c53b34@286bbb73f3bcdfa206205acef80ec835:1542212565695' + argentina_protected_areas_20191117: { + uid: 'argentina_protected_areas_20191117__production', + layergroupid: 'p2cs-sei@d80f5d17@f4d011c041959baf38c3f84509277c63:1574065380303' + }, + argentina_deforestation_2015_2017_20191128: { + uid: 'argentina_deforestation_2015_2017_20191128__production', + layergroupid: 'p2cs-sei@e48f44ab@c1314fd8c9bd4a5d626c253045a06664:1574961429578' + }, + id_provinces: { + uid: 'id_provinces__production', + layergroupid: 'p2cs-sei@fdb3e261@763b8ba089e515ffd820552dc2951dfb:1560524731493' } }, development: {