diff --git a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts index f5a5294fb..c1bbcec37 100644 --- a/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts +++ b/Models/ThemeConfig/Conversion/LegacyJsonConvert.ts @@ -126,6 +126,11 @@ class UpdateLegacyTheme extends DesugaringStep { 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) { diff --git a/assets/themes/benches/benches.json b/assets/themes/benches/benches.json index 193b38d40..7ed0d305e 100644 --- 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", diff --git a/assets/themes/bicycle_rental/bicycle_rental.json b/assets/themes/bicycle_rental/bicycle_rental.json index 9f30efca3..b26d1bf16 100644 --- 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" ] diff --git a/assets/themes/binoculars/binoculars.json b/assets/themes/binoculars/binoculars.json index 1e77b49c6..fed6bcb98 100644 --- 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" ] diff --git a/assets/themes/cafes_and_pubs/cafes_and_pubs.json b/assets/themes/cafes_and_pubs/cafes_and_pubs.json index 9ab64a6c9..92256e06a 100644 --- 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" ] diff --git a/assets/themes/charging_stations/charging_stations.json b/assets/themes/charging_stations/charging_stations.json index 2b6fc04d2..6c0dbdc86 100644 --- 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" diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index fc948705d..e93273ebf 100644 --- 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", diff --git a/assets/themes/etymology.json b/assets/themes/etymology.json index bd76bf8a3..1ed79cf96 100644 --- 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 diff --git a/assets/themes/facadegardens/facadegardens.json b/assets/themes/facadegardens/facadegardens.json index a9d50b9c6..923346ff3 100644 --- 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", diff --git a/assets/themes/food/food.json b/assets/themes/food/food.json index 796aeefd4..05b4516ce 100644 --- 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" ] diff --git a/assets/themes/fritures/fritures.json b/assets/themes/fritures/fritures.json index 22677da03..46d5a4e8e 100644 --- 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", diff --git a/assets/themes/fruit_trees/fruit_trees.json b/assets/themes/fruit_trees/fruit_trees.json index 3b687bd89..7fe8c9323 100644 --- 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": [ { diff --git a/assets/themes/grb_import/grb_fixme.json b/assets/themes/grb_import/grb_fixme.json index 313b5efb6..2ae057dfd 100644 --- 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 }, diff --git a/assets/themes/grb_import/missing_streets.json b/assets/themes/grb_import/missing_streets.json index 4bcd22c2a..d30e0a2cc 100644 --- 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 }, diff --git a/assets/themes/hackerspaces/hackerspaces.json b/assets/themes/hackerspaces/hackerspaces.json index 4deafa356..c5728cb7e 100644 --- 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", diff --git a/assets/themes/hailhydrant/hailhydrant.json b/assets/themes/hailhydrant/hailhydrant.json index a135d0f4e..0d4007b45 100644 --- 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", diff --git a/assets/themes/maps/maps.json b/assets/themes/maps/maps.json index 305eb4a17..b18aecf4f 100644 --- 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" ] diff --git a/assets/themes/nature/nature.json b/assets/themes/nature/nature.json index 8dc62a6df..294d6be52 100644 --- 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", diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json index c66a67d92..3231ecbab 100644 --- 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, diff --git a/assets/themes/observation_towers/observation_towers.json b/assets/themes/observation_towers/observation_towers.json index 5a76cb753..f6bf823f9 100644 --- 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" ] diff --git a/assets/themes/play_forests/play_forests.json b/assets/themes/play_forests/play_forests.json index 7c6950912..1a003edff 100644 --- 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" ] diff --git a/assets/themes/playgrounds/playgrounds.json b/assets/themes/playgrounds/playgrounds.json index 696b7ff1b..8ab906ae8 100644 --- 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" ] diff --git a/assets/themes/postal_codes/postal_codes.json b/assets/themes/postal_codes/postal_codes.json index 6e14f97ec..247b4de33 100644 --- 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, diff --git a/assets/themes/shops/shops.json b/assets/themes/shops/shops.json index 6f07ffdf2..0c058075e 100644 --- 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" ] diff --git a/assets/themes/sidewalks/sidewalks.json b/assets/themes/sidewalks/sidewalks.json index 72ef76042..28cbe8ae8 100644 --- 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": [ { diff --git a/assets/themes/sport_pitches/sport_pitches.json b/assets/themes/sport_pitches/sport_pitches.json index d2a88cd00..b0237a414 100644 --- 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" ] diff --git a/assets/themes/surveillance/surveillance.json b/assets/themes/surveillance/surveillance.json index fefeb406c..197362a86 100644 --- 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", diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json index febb712fe..6efb7ccdb 100644 --- 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, diff --git a/assets/themes/waste_basket/waste_basket.json b/assets/themes/waste_basket/waste_basket.json index b0bca66e1..d312125a8 100644 --- 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",