Fix the GenericCityObject extension to stick to v1.1

cityjson · Oct 27, 2023 · 5dc5b3d · 5dc5b3d
1 parent a1db26f
commit 5dc5b3d
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 2 deletions.
diff --git a/datasets/index.md b/datasets/index.md
@@ -38,7 +38,6 @@ Here are 2 files with [Geometry templates](https://www.cityjson.org/specs/#geome
 
 ## With Extensions
 
-  - [cube.city.json](https://3d.bk.tudelft.nl/opendata/cityjson/simplegeom/v2.0/cube.city.json) -- a unit cube of type `"+GenericCityObject"`, which is defined in the Generic Extension ([see its schema](https://www.cityjson.org/extensions/download/generic.ext.json))
   - [noise_data.city.json](../tutorials/files/noise_data.city.json) is a demo file with the Noise extension (schema [noise.ext.json](../tutorials/files/noise.ext.json)), more details in [this tutorial]({{ '/tutorials/extension/' | prepend: site.baseurl }})
 
 

diff --git a/extensions/download/generic.ext.json b/extensions/download/generic.ext.json
@@ -3,7 +3,7 @@
   "name": "Generic",
   "uri": "https://www.cityjson.org/extensions/download/generic.ext.json",
   "version": "1.0.1",
-  "versionCityJSON": "2.0",
+  "versionCityJSON": "1.1",
   "description": "Extension to handle GenericCityObject; meant as a template to learn how to construct an Extension",
 
   "extraRootProperties": {},     

diff --git a/extensions/download/v20/generic.ext.json b/extensions/download/v20/generic.ext.json
@@ -0,0 +1,50 @@
+{
+  "type": "CityJSONExtension",
+  "name": "Generic",
+  "uri": "https://www.cityjson.org/extensions/download/generic.ext.json",
+  "version": "1.0.1",
+  "versionCityJSON": "2.0",
+  "description": "Extension to handle GenericCityObject; meant as a template to learn how to construct an Extension",
+
+  "extraRootProperties": {},     
+
+  "extraAttributes": {},
+
+  "extraSemanticSurfaces": {},
+
+  "extraCityObjects": {
+    "+GenericCityObject": {
+      "allOf": [
+        { "$ref": "cityobjects.schema.json#/_AbstractCityObject" },
+        {
+          "properties": {
+            "type": { "enum": [ "+GenericCityObject" ] },
+            "attributes": {
+              "type": "object",
+              "properties": {
+                "my-attribute": { "type": "string" }
+              }
+            },
+            "geometry": {
+              "type": "array",
+              "items": {
+                "oneOf": [
+                  { "$ref": "geomprimitives.schema.json#/MultiPoint" },
+                  { "$ref": "geomprimitives.schema.json#/MultiLineString" },
+                  { "$ref": "geomprimitives.schema.json#/MultiSurface" },
+                  { "$ref": "geomprimitives.schema.json#/CompositeSurface" },
+                  { "$ref": "geomprimitives.schema.json#/Solid" },
+                  { "$ref": "geomprimitives.schema.json#/MultiSolid" },
+                  { "$ref": "geomprimitives.schema.json#/CompositeSolid" },
+                  { "$ref": "geomtemplates.schema.json#/GeometryInstance" }
+                ]
+              }
+            }
+          },
+          "required": [ "type" ]
+        }
+      ]
+    }
+  }
+
+}
diff --git a/extensions/download/v20/potato.ext.json b/extensions/download/v20/potato.ext.json
@@ -0,0 +1,45 @@
+{
+  "type": "CityJSONExtension",
+  "name": "Potato",
+  "uri": "https://www.cityjson.org/extensions/download/potato.ext.json",
+  "version": "1.0",
+  "versionCityJSON": "2.0",
+  "description": "Extension to handle massive potatoes in our cities",
+
+  "extraRootProperties": {},     
+
+  "extraAttributes": {},
+
+  "extraSemanticSurfaces": {},
+
+  "extraCityObjects": {
+    "+Potato": {
+      "allOf": [
+        { "$ref": "cityobjects.schema.json#/_AbstractCityObject" },
+        {
+          "properties": {
+            "type": { "enum": [ "+Potato" ] },
+            "attributes": {
+              "type": "object",
+              "properties": {
+                "my-attribute": { "type": "string" }
+              }
+            },
+            "geometry": {
+              "type": "array",
+              "items": {
+                "oneOf": [
+                  { "$ref": "geomprimitives.schema.json#/MultiSurface" },
+                  { "$ref": "geomprimitives.schema.json#/CompositeSurface" },
+                  { "$ref": "geomprimitives.schema.json#/Solid" }
+                ]
+              }
+            }
+          },
+          "required": [ "type" ]
+        }
+      ]
+    }
+  }
+
+}