reset label font

Author: digitaltom

app/javascript/controllers/map_controller.js

@@ -6,14 +6,15 @@ import { initializeEditMode } from 'maplibre/edit'
 import { initializeSocket, mapChannel } from 'channels/map_channel'
 import { addUndoState, clearUndoHistory } from 'maplibre/undo'
 import { resetInitializationState } from 'maplibre/layers/layers'
-import { clearImageState } from 'maplibre/styles/styles'
+import { clearImageState, resetLabelFont } from 'maplibre/styles/styles'
 
 export default class extends Controller {
   async connect () {
     // Clear module-level state from previous map
     resetInitializationState()
     clearImageState()
     clearUndoHistory()
+    resetLabelFont()
 
     functions.e('#map-header nav', e => { e.style.display = 'none' })
     await initializeMap('maplibre-map')
@@ -45,6 +46,7 @@ export default class extends Controller {
     resetInitializationState()
     clearImageState()
     clearUndoHistory()
+    resetLabelFont()
   }
 
   // paste feature from clipboard

app/javascript/maplibre/layers/basemap.js

@@ -45,6 +45,7 @@ export class BasemapLayer extends Layer {
       const features = map.queryRenderedFeatures(e.point, { layers: queryLayerIds})
 
       if (features.length) {
+        console.log('Selected features: ', features)
         const feature = features[0]
 
         const geojsonFeature = {

app/javascript/maplibre/styles/styles.js

@@ -31,7 +31,7 @@ export const viewStyleNames = [
   'polygon-layer-extrusion'
 ]
 
-export function setStyleDefaultFont (font) { labelFont = [font] }
+export function setStyleDefaultFont(font) { labelFont = [font] }
 
 export function initializeViewStyles (sourceName, heatmap=false) {
   // console.log('Initializing view styles for source ' + sourceName)
@@ -127,6 +127,9 @@ export function clearImageState() {
   Object.keys(imageState).forEach(key => delete imageState[key])
 }
 
+// Reset labelFont to default when clearing state
+export function resetLabelFont() { labelFont = [defaultFont] }
+
 export async function loadImage (e) {
   // Skip if already loading, loaded, or failed
   if (imageState[e.id]) {
@@ -400,9 +403,7 @@ function textLayerStyles(mode) {
       'format',
       ['coalesce', ['get', 'label'], ['get', 'room']],
       {
-        'text-font': [
-          'case',
-          ['has', 'label-font'],
+        'text-font': ['coalesce',
           ['get', 'label-font'],
           ['literal', labelFont]
         ]

app/javascript/maplibre/undo.js

@@ -20,7 +20,7 @@ export function clearUndoHistory() {
     const redoBtn = document.querySelector('button.maplibregl-ctrl-redo')
     if (undoBtn) undoBtn.classList.add('hidden')
     if (redoBtn) redoBtn.classList.add('hidden')
-  } catch (_e) {
+  } catch {
     // Buttons may not exist yet
   }
 }

app/models/layer.rb

@@ -6,6 +6,7 @@ class Layer
   belongs_to :map, optional: true, touch: true
   has_many :features, dependent: :destroy
 
+  default_scope { reorder(created_at: :asc) }
   scope :geojson, -> { where(type: "geojson") }
   scope :overpass, -> { where(type: "overpass") }
 

app/models/map.rb

@@ -8,7 +8,7 @@ class Map
   belongs_to :user, optional: true, counter_cache: true
 
   # implicit_order_column is not supported by mongoid
-  default_scope { sorted(:created_at, :desc) }
+  default_scope { sorted(:created_at, :asc) }
   scope :listed, -> { where(view_permission: "listed") }
   scope :ulogger, -> { where(:_id.lt => BSON::ObjectId("000000000000002147483647")) }
   scope :demo, -> { where(demo: true) }
@@ -19,7 +19,7 @@ class Map
   }
   scope :sorted, ->(col, dir) {
     col = "created_at" unless col.present?
-    dir = %w[asc desc].include?(dir) ? dir : "asc"
+    dir = %w[asc desc].include?(dir) ? dir.to_s : "asc"
     reorder(col.to_sym => dir.to_sym)
   }