Remove empty social images

2022-02-19 17:40:51 +01:00 · 2022-02-19 17:40:51 +01:00 · 2e586cedc4
commit 2e586cedc4
parent 55f9ee605f
29 changed files with 5 additions and 28 deletions
--- a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
+++ b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts
@ -126,6 +126,11 @@ class UpdateLegacyTheme extends DesugaringStep<LayoutConfigJson> {

    convert(json: LayoutConfigJson, context: string): { result: LayoutConfigJson; errors: string[]; warnings: string[] } {
        const oldThemeConfig = {...json}
+        
+        if(oldThemeConfig.socialImage === ""){
+            delete oldThemeConfig.socialImage
+        }
+        
        if (oldThemeConfig["roamingRenderings"] !== undefined) {

            if (oldThemeConfig["roamingRenderings"].length == 0) {
--- a/assets/themes/benches/benches.json
+++ b/assets/themes/benches/benches.json
@ -45,7 +45,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 1.5,
-  "socialImage": "",
  "layers": [
    "bench",
    "bench_at_pt",
--- a/assets/themes/bicycle_rental/bicycle_rental.json
+++ b/assets/themes/bicycle_rental/bicycle_rental.json
@ -19,7 +19,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 0.05,
-  "socialImage": "",
  "layers": [
    "bicycle_rental"
  ]
--- a/assets/themes/binoculars/binoculars.json
+++ b/assets/themes/binoculars/binoculars.json
@ -33,7 +33,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 1.5,
-  "socialImage": "",
  "layers": [
    "binocular"
  ]
--- a/assets/themes/cafes_and_pubs/cafes_and_pubs.json
+++ b/assets/themes/cafes_and_pubs/cafes_and_pubs.json
@ -22,7 +22,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 1.5,
-  "socialImage": "",
  "layers": [
    "cafe_pub"
  ]
--- a/assets/themes/charging_stations/charging_stations.json
+++ b/assets/themes/charging_stations/charging_stations.json
@ -39,7 +39,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 1.5,
-  "socialImage": "",
  "defaultBackgroundId": "CartoDB.Voyager",
  "layers": [
    "charging_station"
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@ -41,7 +41,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 1.5,
-  "socialImage": "",
  "layers": [
    {
      "id": "climbing_club",
--- a/assets/themes/etymology.json
+++ b/assets/themes/etymology.json
@ -32,7 +32,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 2,
-  "socialImage": "",
  "clustering": {
    "maxZoom": 14,
    "minNeededElements": 250
--- a/assets/themes/facadegardens/facadegardens.json
+++ b/assets/themes/facadegardens/facadegardens.json
@ -36,7 +36,6 @@
  "startLon": 4.480705,
  "startZoom": 15,
  "widenFactor": 1.5,
-  "socialImage": "",
  "layers": [
    {
      "id": "facadegardens",
--- a/assets/themes/food/food.json
+++ b/assets/themes/food/food.json
@ -20,7 +20,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 3,
-  "socialImage": "",
  "layers": [
    "food"
  ]
--- a/assets/themes/fritures/fritures.json
+++ b/assets/themes/fritures/fritures.json
@ -16,7 +16,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 3,
-  "socialImage": "",
  "layers": [
    {
      "builtin": "food",
--- a/assets/themes/fruit_trees/fruit_trees.json
+++ b/assets/themes/fruit_trees/fruit_trees.json
@ -16,7 +16,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 2,
-  "socialImage": "",
  "hideFromOverview": true,
  "layers": [
    {
--- a/assets/themes/grb_import/grb_fixme.json
+++ b/assets/themes/grb_import/grb_fixme.json
@ -16,7 +16,6 @@
  "startLon": 3.231,
  "startZoom": 14,
  "widenFactor": 2,
-  "socialImage": "",
  "clustering": {
    "maxZoom": 15
  },
--- a/assets/themes/grb_import/missing_streets.json
+++ b/assets/themes/grb_import/missing_streets.json
@ -16,7 +16,6 @@
  "startLon": 4.026489,
  "startZoom": 9,
  "widenFactor": 2,
-  "socialImage": "",
  "clustering": {
    "maxZoom": 15
  },
--- a/assets/themes/hackerspaces/hackerspaces.json
+++ b/assets/themes/hackerspaces/hackerspaces.json
@ -29,7 +29,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 5,
-  "socialImage": "",
  "layers": [
    {
      "id": "hackerspaces",
--- a/assets/themes/hailhydrant/hailhydrant.json
+++ b/assets/themes/hailhydrant/hailhydrant.json
@ -37,7 +37,6 @@
  "startLon": 121.6625,
  "startZoom": 6,
  "widenFactor": 3,
-  "socialImage": "",
  "layers": [
    "hydrant",
    "extinguisher",
--- a/assets/themes/maps/maps.json
+++ b/assets/themes/maps/maps.json
@ -37,7 +37,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 5,
-  "socialImage": "",
  "layers": [
    "map"
  ]
--- a/assets/themes/nature/nature.json
+++ b/assets/themes/nature/nature.json
@ -19,7 +19,6 @@
  "startLon": 3.22435,
  "startZoom": 12,
  "widenFactor": 2,
-  "socialImage": "",
  "layers": [
    "drinking_water",
    "birdhide",
--- a/assets/themes/natuurpunt/natuurpunt.json
+++ b/assets/themes/natuurpunt/natuurpunt.json
@ -41,7 +41,6 @@
    ]
  ],
  "widenFactor": 2,
-  "socialImage": "",
  "defaultBackgroundId": "CartoDB.Positron",
  "enablePdfDownload": true,
  "enableDownload": false,
--- a/assets/themes/observation_towers/observation_towers.json
+++ b/assets/themes/observation_towers/observation_towers.json
@ -32,7 +32,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 5,
-  "socialImage": "",
  "layers": [
    "observation_tower"
  ]
--- a/assets/themes/play_forests/play_forests.json
+++ b/assets/themes/play_forests/play_forests.json
@ -17,7 +17,6 @@
  "startZoom": 1,
  "hideFromOverview": true,
  "widenFactor": 3,
-  "socialImage": "",
  "layers": [
    "play_forest"
  ]
--- a/assets/themes/playgrounds/playgrounds.json
+++ b/assets/themes/playgrounds/playgrounds.json
@ -45,7 +45,6 @@
  "startLon": 4.399,
  "startZoom": 13,
  "widenFactor": 5,
-  "socialImage": "",
  "layers": [
    "playground"
  ]
--- a/assets/themes/postal_codes/postal_codes.json
+++ b/assets/themes/postal_codes/postal_codes.json
@ -22,7 +22,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 0.05,
-  "socialImage": "",
  "hideFromOverview": true,
  "clustering": false,
  "overpassTimeout": 180,
--- a/assets/themes/shops/shops.json
+++ b/assets/themes/shops/shops.json
@ -35,7 +35,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 3,
-  "socialImage": "",
  "layers": [
    "shops"
  ]
--- a/assets/themes/sidewalks/sidewalks.json
+++ b/assets/themes/sidewalks/sidewalks.json
@ -18,7 +18,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 0.05,
-  "socialImage": "",
  "hideFromOverview": true,
  "layers": [
    {
--- a/assets/themes/sport_pitches/sport_pitches.json
+++ b/assets/themes/sport_pitches/sport_pitches.json
@ -39,7 +39,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 2,
-  "socialImage": "",
  "layers": [
    "sport_pitch"
  ]
--- a/assets/themes/surveillance/surveillance.json
+++ b/assets/themes/surveillance/surveillance.json
@ -39,7 +39,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 2,
-  "socialImage": "",
  "defaultBackgroundId": "osm",
  "layers": [
    "direction",
--- a/assets/themes/uk_addresses/uk_addresses.json
+++ b/assets/themes/uk_addresses/uk_addresses.json
@ -24,7 +24,6 @@
  "startLon": 51.52224,
  "startZoom": 17,
  "widenFactor": 1.01,
-  "socialImage": "",
  "hideFromOverview": true,
  "clustering": {
    "minNeededFeatures": 25,
--- a/assets/themes/waste_basket/waste_basket.json
+++ b/assets/themes/waste_basket/waste_basket.json
@ -32,7 +32,6 @@
  "startLon": 0,
  "startZoom": 1,
  "widenFactor": 2,
-  "socialImage": "",
  "layers": [
    {
      "builtin": "waste_basket",