Public API, expose place > date_with_qualifier to layer and map level…

…, add layer_title and color to place API
a-thousand-channels · Oct 30, 2024 · 6cf3475 · 6cf3475
1 parent 465ccfa
commit 6cf3475
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/app/views/public/layers/show.json.jbuilder b/app/views/public/layers/show.json.jbuilder
@@ -8,7 +8,7 @@ json.layer do
     json.array! @places do |place|
       next unless place.published
 
-      json.call(place, :id, :uid, :title, :subtitle, :teaser, :text, :sources, :link, :imagelink, :imagelink2, :audiolink, :published, :startdate, :enddate, :startdate_qualifier, :enddate_qualifier, :location, :address, :zip, :city, :text, :country, :featured, :layer_id, :icon_link, :icon_class, :icon_name)
+      json.call(place, :id, :uid, :title, :subtitle, :teaser, :text, :sources, :link, :imagelink, :imagelink2, :audiolink, :published, :date_with_qualifier, :startdate, :enddate, :startdate_qualifier, :enddate_qualifier, :location, :address, :zip, :city, :text, :country, :featured, :layer_id, :icon_link, :icon_class, :icon_name)
       json.lat place.public_lat
       json.lon place.public_lon
       json.annotations place.annotations do |annotation|

diff --git a/app/views/public/maps/show.json.jbuilder b/app/views/public/maps/show.json.jbuilder
@@ -15,7 +15,7 @@ json.map do
         json.array! layer.places.published do |place|
           next unless place.published
 
-          json.call(place, :id, :uid, :title, :subtitle, :teaser, :text, :sources, :link, :imagelink, :imagelink2, :audiolink, :published, :startdate, :enddate, :location, :address, :zip, :city, :text, :country, :featured, :shy, :layer_id, :icon_link, :icon_class, :icon_name)
+          json.call(place, :id, :uid, :title, :subtitle, :teaser, :text, :sources, :link, :imagelink, :imagelink2, :audiolink, :published, :date_with_qualifier, :startdate, :enddate, :location, :address, :zip, :city, :text, :country, :featured, :shy, :layer_id, :icon_link, :icon_class, :icon_name)
           json.lat place.public_lat
           json.lon place.public_lon
           json.annotations place.annotations do |annotation|

diff --git a/app/views/public/places/show.json.jbuilder b/app/views/public/places/show.json.jbuilder
@@ -3,5 +3,5 @@
 json.place do
   next unless @place.published
 
-  json.call(@place, :id, :uid, :title, :subtitle, :teaser, :text, :sources, :link, :imagelink, :imagelink2, :audiolink, :published, :date, :date_with_qualifier, :startdate, :enddate, :startdate_qualifier, :enddate_qualifier, :location, :address, :zip, :city, :text, :country, :featured, :layer_id, :icon_link, :icon_class, :icon_name)
+  json.call(@place, :id, :uid, :title, :subtitle, :teaser, :text, :sources, :link, :imagelink, :imagelink2, :audiolink, :published, :date, :date_with_qualifier, :startdate, :enddate, :startdate_qualifier, :enddate_qualifier, :location, :address, :zip, :city, :text, :country, :featured, :layer_id, :layer_title, :color, :icon_link, :icon_class, :icon_name)
 end
diff --git a/spec/support/api/map.json b/spec/support/api/map.json
@@ -270,6 +270,7 @@
                               "imagelink2",
                               "audiolink",
                               "published",
+                              "date_with_qualifier",
                               "startdate",
                               "enddate",
                               "lat",
@@ -398,6 +399,16 @@
                                     true
                                  ]
                               },
+                              "date_with_qualifier":{
+                                 "$id":"#/properties/map/properties/layer/items/properties/places/items/properties/date_with_qualifier",
+                                 "type":["string", "null"],
+                                 "title":"The date_with_qualifier Schema",
+                                 "default":"",
+                                 "examples":[
+                                    "ca. 1980 - 2000"
+                                 ],
+                                 "pattern":"^(.*)$"
+                              },                              
                               "startdate":{
                                  "$id":"#/properties/map/properties/layer/items/properties/places/items/properties/startdate",
                                  "type":["string", "null"],