add protomaps

Author: digitaltom

app/assets/images/base_maps/protomapsLight.jpg

@@ -168,7 +168,7 @@ export function basemaps () {
       }
     },
     // https://manage.thunderforest.com/dashboard
-    openCycleMap: {
+    thunderforestCycle: {
       description: window.__('Thunderforest Cycle map with elevation contours and cycling infrastructure.'),
       style: {
         version: 8,
@@ -216,6 +216,9 @@ export function basemaps () {
     openfreemapBright: { description: window.__('Bright, colorful vector style with clear roads and readable labels.'), style: 'https://tiles.openfreemap.org/styles/bright', defaults: { font: notoFont } },
     openfreemapLiberty: { description: window.__('Detailed vector map with landmarks, buildings and points of interest.'), style: 'https://tiles.openfreemap.org/styles/liberty', sourceName: 'openmaptiles', defaults: { font: notoFont } },
 
+    // https://protomaps.com/api, themes: light, dark, white, grayscale, black
+    protomapsLight: { description: window.__('Light Protomaps vector style with soft colors and clear labels.'), style: 'https://api.protomaps.com/styles/v5/light/en.json?key=' + window.gon.map_keys.protomaps, sourceName: 'protomaps', defaults: { font: notoFont } },
+
     // https://github.com/versatiles-org/versatiles-style
     // fonts: https://github.com/versatiles-org/versatiles-fonts
     versatilesColorful: { description: window.__('Colorful vector map with vivid colors and a clear road hierarchy.'), style: 'https://tiles.versatiles.org/assets/styles/colorful/style.json', sourceName: 'versatiles-shortbread' },

…assets/images/base_maps/openCycleMap.jpg …/images/base_maps/thunderforestCycle.jpgapp/assets/images/base_maps/openCycleMap.jpg renamed to app/assets/images/base_maps/thunderforestCycle.jpg app/assets/images/base_maps/openCycleMap.jpg renamed to app/assets/images/base_maps/thunderforestCycle.jpg

@@ -56,19 +56,20 @@ class Map
 
   # Only BASE_MAPS are available in the UI
   BASE_MAPS = [ "versatilesColorful", "satelliteStreets", "openTopoTiles",
-    "openfreemapLiberty", "versatilesGraybeard", "versatilesEclipse",
-    "stamenWatercolorTiles", "cyclosmTiles", "basemapWorld" ]
+    "openfreemapLiberty", "protomapsLight", "versatilesGraybeard", "versatilesEclipse",
+    "stamenWatercolorTiles", "cyclosmTiles", "basemapWorld", "artistic" ]
   # App admins can also select from these maps
-  EXPERIMENTAL_MAPS = [ "stamenTonerTiles", "openCycleMap", "versatilesGraybeardSnow", "thunderforestContrast", "artistic", "versatilesSatelliteStreets" ]
+  EXPERIMENTAL_MAPS = [ "stamenTonerTiles", "thunderforestCycle", "versatilesGraybeardSnow", "thunderforestContrast", "versatilesSatelliteStreets" ]
 
   STADIA_MAPS = [ "stamenTonerTiles", "stamenWatercolorTiles" ]
   OPENFREE_MAPS = [ "openfreemapPositron", "openfreemapBright", "openfreemapLiberty" ]
   VERSATILES_MAPS = [ "versatilesColorful", "versatilesGraybeard", "versatilesGraybeardSnow", "artistic", "versatilesSatelliteStreets" ]
   MAPTILER_MAPS = [ "maptilerBuildings", "maptilerHybrid", "maptilerDataviz",
     "maptilerStreets", "maptilerNoStreets", "maptilerWinter",
     "maptilerBike", "maptilerBasic" ]
+  PROTOMAPS_MAPS = [ "protomapsLight" ]
   OTHER_MAPS = [ "cyclosmTiles", "satelliteStreets", "osmRasterTiles",
-    "openCycleMap", "thunderforestContrast" ]
+    "thunderforestCycle", "thunderforestContrast" ]
 
   DEFAULT_CENTER = [ 11.077, 49.447 ].freeze
   DEFAULT_ZOOM = 10
@@ -174,6 +175,7 @@ def self.provider_keys
      maptiler: ENV["MAPTILER_KEY"],
      openrouteservice: ENV["OPENROUTESERVICE_KEY"],
      thunderforest: ENV["THUNDERFOREST_KEY"],
+     protomaps: ENV["PROTOMAPS_KEY"],
      indoorequal: ENV["INDOOREQUAL_KEY"] }
   end
 
@@ -329,6 +331,10 @@ def get_base_map
       return base_map if ENV["MAPTILER_KEY"].present?
       logger.warn("Cannot use maptiler map #{base_map} without MAPTILER_KEY. Falling back to: #{default_base_map}")
       return default_base_map
+    elsif PROTOMAPS_MAPS.include?(base_map)
+      return base_map if ENV["PROTOMAPS_KEY"].present?
+      logger.warn("Cannot use protomaps map #{base_map} without PROTOMAPS_KEY. Falling back to: #{default_base_map}")
+      return default_base_map
     elsif (BASE_MAPS + OPENFREE_MAPS + VERSATILES_MAPS + STADIA_MAPS + OTHER_MAPS).include?(base_map) || base_map == "test"
       return base_map
     end

app/javascript/maplibre/styles/basemaps.js

@@ -36,6 +36,7 @@
           = _("Background map")
 
         - maps = (@user&.admin? ? Map::BASE_MAPS + Map::EXPERIMENTAL_MAPS : Map::BASE_MAPS)
+        - maps -= Map::PROTOMAPS_MAPS if ENV["PROTOMAPS_KEY"].blank?
         - maps.each do |base_map|
           - active = (@map_properties[:base_map] == base_map)
           - map_image = "base_maps/placeholder.jpg"