Merge pull request #28 from developmentseed/style/tweak-default-line-…

…style Tweak default line style
developmentseed · Mar 17, 2021 · e33b7f3 · e33b7f3
2 parents 0c3741b + d4e975d
commit e33b7f3
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 38 deletions.
diff --git a/content/study/posts/kenya-mb.json b/content/study/posts/kenya-mb.json
@@ -31,6 +31,10 @@
       ],
       "type": "vector"
     },
+    "transmission-stations": {
+      "data": "https://aep-tiles.staging.derilinx.com/geojson/ke/transmission_stations-wgs84.json",
+      "type": "geojson"
+    },
     "roads": {
       "tiles": [
         "https://aep-tiles.staging.derilinx.com/tiles/ke/roads/{z}/{x}/{y}.pbf"
@@ -67,7 +71,9 @@
       "source": "roads",
       "source-layer": "data_layer",
       "paint": {
-        "line-color": "#14213D"
+        "line-color": "#14213D",
+        "line-opacity": ["interpolate", ["linear"], ["zoom"], 6, 0.32, 12, 0.48],
+        "line-width": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 12, 2]
       }
     },
     {
@@ -123,6 +129,11 @@
       "source": "transformers",
       "source-layer": "data_layer"
     },
+    {
+      "id": "transmission-stations",
+      "type": "circle",
+      "source": "transmission-stations"
+    },
     {
       "id": "schools",
       "type": "circle",

diff --git a/content/study/posts/kenya.yml b/content/study/posts/kenya.yml
@@ -51,30 +51,30 @@ layers:
     source:
       name: energydata.info
       url: https://energydata.info/dataset/kenya-kenya-electricity-network
-  - id: roads
-    name: Roads
+  - id: transformers
+    name: Distribution Transformers
     category: contextual
-    mbLayer: roads
-    info: Road network in Kenya. The dataset was provided by Kenya Roads Board (KRB).
+    mbLayer: transformers
+    info:
     source:
       name: energydata.info
-      url: https://energydata.info/dataset/kenya-roads-1
-  - id: schools
-    name: Schools
+      url: https://energydata.info/dataset/kenya-distribution-transformers
+  - id: substations
+    name: Primary Substations
     category: contextual
-    mbLayer: schools
-    info: The dataset contains Distribution Transformers in Kenya.The dataset was provided by Kenya Power and Lighting Company (KPLC).
+    mbLayer: substation
+    info: The dataset contains primary substations in Kenya. The dataset was provided by Kenya Power and Lighting Company (KPLC).
     source:
       name: energydata.info
-      url: https://energydata.info/dataset/kenya-schools
-  - id: transformers
-    name: Distribution Transformers
+      url: https://energydata.info/dataset/kenya-primary-substations
+  - id: transmission
+    name: Transmission Stations
     category: contextual
-    mbLayer: transformers
-    info:
+    mbLayer: transmission-stations
+    info: The data contains transmission station locations in Kenya. The dataset was provided by Kenya Power and Lighting Company (KPLC).
     source:
       name: energydata.info
-      url: https://energydata.info/dataset/kenya-distribution-transformers
+      url: https://energydata.info/dataset/kenya-transmission-stations
   - id: power
     name: Power Stations
     category: contextual
@@ -84,41 +84,40 @@ layers:
     source:
       name: energydata.info
       url: https://energydata.info/dataset/kenya-power-stations
-  - id: health
-    name: Healthcare Facilities
+  - id: population
+    name: Population and Household Dataset (2009 & 2016)
     category: contextual
     disabled: true
     mbLayer: 11kv
-    info: Data on healthcare facility locations in Kenya. The dataset was provided by the Government of Kenya.
+    info: Population and Household statistics for the years 2009 and 2016 as well as the enumeration areas.The dataset was provided by Kenya National Bureau of Statistics (KNBS).
     source:
       name: energydata.info
-      url: https://energydata.info/dataset/kenya-healthcare-facilities
-  - id: substations
-    name: Primary Substations
+      url: https://energydata.info/dataset/kenya-population-and-household-dataset
+  - id: roads
+    name: Roads
     category: contextual
-    mbLayer: substation
-    info: The dataset contains primary substations in Kenya. The dataset was provided by Kenya Power and Lighting Company (KPLC).
+    mbLayer: roads
+    info: Road network in Kenya. The dataset was provided by Kenya Roads Board (KRB).
     source:
       name: energydata.info
-      url: https://energydata.info/dataset/kenya-primary-substations
-  - id: transmission
-    name: Transmission Stations
+      url: https://energydata.info/dataset/kenya-roads-1
+  - id: health
+    name: Healthcare Facilities
     category: contextual
     disabled: true
     mbLayer: 11kv
-    info: The data contains transmission station locations in Kenya. The dataset was provided by Kenya Power and Lighting Company (KPLC).
+    info: Data on healthcare facility locations in Kenya. The dataset was provided by the Government of Kenya.
     source:
       name: energydata.info
-      url: https://energydata.info/dataset/kenya-transmission-stations
-  - id: population
-    name: Population and Household Dataset (2009 & 2016)
+      url: https://energydata.info/dataset/kenya-healthcare-facilities
+  - id: schools
+    name: Schools
     category: contextual
-    disabled: true
-    mbLayer: 11kv
-    info: Population and Household statistics for the years 2009 and 2016 as well as the enumeration areas.The dataset was provided by Kenya National Bureau of Statistics (KNBS).
+    mbLayer: schools
+    info: School locations in Kenya. It comprises Primary and Secondary Schools. The dataset was provided by Kenya Ministry of Education.
     source:
       name: energydata.info
-      url: https://energydata.info/dataset/kenya-population-and-household-dataset
+      url: https://energydata.info/dataset/kenya-schools
   - id: minigrid
     name: Overview of Off-Grid Electricity Service Areas
     category: result

diff --git a/src/components/study-map/mb-map.js b/src/components/study-map/mb-map.js
@@ -18,12 +18,12 @@ const defaultPaintObject = {
     'circle-stroke-color': '#FFFFFF',
     'circle-stroke-opacity': 0.64,
     'circle-stroke-width': 2,
-    'circle-radius': ['interpolate', ['linear'], ['zoom'], 6, 5, 16, 15]
+    'circle-radius': ['interpolate', ['linear'], ['zoom'], 6, 5, 12, 15]
   },
   line: {
     'line-color': '#747BFC',
-    'line-opacity': ['interpolate', ['linear'], ['zoom'], 6, 0.32, 16, 0.48],
-    'line-width': ['interpolate', ['linear'], ['zoom'], 6, 0.5, 16, 2]
+    'line-opacity': ['interpolate', ['linear'], ['zoom'], 6, 0.96, 12, 0.66],
+    'line-width': ['interpolate', ['linear'], ['zoom'], 6, 1, 12, 2]
   }
 };