From 791060ac94900dbd238eb59867131e4f8f4a4775 Mon Sep 17 00:00:00 2001 From: Norbert Hartl Date: Thu, 2 Jul 2020 09:25:13 +0200 Subject: [PATCH] sources migrated --- .properties | 2 +- BaselineOfOGC.package/.filetree | 5 -- .../BaselineOfOGC.class/README.md | 0 .../BaselineOfOGC.class/properties.json | 11 --- .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 BaselineOfOGC.package/monticello.meta/package | 1 - BaselineOfOGC.package/properties.json | 1 - .../BaselineOfOGC.class.st | 12 +++- BaselineOfOGC/package.st | 1 + OGC-Core-Tests.package/.filetree | 5 -- .../OGCPointTest.class/README.md | 0 .../instance/testPointGeometricType.st | 5 -- .../instance/testPointHasNoDimension.st | 7 -- .../OGCPointTest.class/properties.json | 11 --- .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 .../monticello.meta/package | 1 - OGC-Core-Tests.package/properties.json | 1 - OGC-Core-Tests/OGCPointTest.class.st | 21 ++++++ OGC-Core-Tests/package.st | 1 + OGC-Core.package/.filetree | 5 -- .../OGCCurve.class/properties.json | 11 --- .../OGCGeometry.class/instance/dimension.st | 3 - .../instance/geometryType.st | 3 - .../OGCGeometry.class/instance/is3D.st | 3 - .../OGCGeometry.class/instance/isEmpty.st | 3 - .../OGCGeometry.class/properties.json | 11 --- .../properties.json | 11 --- OGC-Core.package/OGCLine.class/README.md | 5 -- .../OGCLine.class/properties.json | 11 --- .../OGCLineString.class/properties.json | 11 --- .../OGCLinearRing.class/properties.json | 11 --- .../OGCMultiCurve.class/properties.json | 11 --- .../OGCMultiPoint.class/properties.json | 11 --- .../OGCMultiSurface.class/properties.json | 11 --- OGC-Core.package/OGCPoint.class/README.md | 8 --- .../OGCPoint.class/class/geometryType.st | 3 - OGC-Core.package/OGCPoint.class/class/x.y..st | 5 -- .../OGCPoint.class/instance/dimension.st | 3 - .../OGCPoint.class/instance/printOn..st | 3 - .../OGCPoint.class/instance/x..st | 3 - OGC-Core.package/OGCPoint.class/instance/x.st | 3 - .../OGCPoint.class/instance/y..st | 3 - OGC-Core.package/OGCPoint.class/instance/y.st | 3 - .../OGCPoint.class/instance/z..st | 3 - OGC-Core.package/OGCPoint.class/instance/z.st | 3 - .../OGCPoint.class/properties.json | 15 ---- .../OGCPolygon.class/properties.json | 11 --- .../OGCSurface.class/properties.json | 11 --- .../monticello.meta/categories.st | 1 - .../monticello.meta/initializers.st | 0 OGC-Core.package/monticello.meta/package | 1 - OGC-Core.package/properties.json | 1 - .../README.md => OGC-Core/OGCCurve.class.st | 9 ++- .../OGCGeometry.class.st | 29 +++++++- .../OGCGeometryCollection.class.st | 9 ++- OGC-Core/OGCLine.class.st | 12 ++++ .../OGCLineString.class.st | 9 ++- .../OGCLinearRing.class.st | 9 ++- .../OGCMultiCurve.class.st | 9 ++- .../OGCMultiPoint.class.st | 9 ++- .../OGCMultiSurface.class.st | 9 ++- OGC-Core/OGCPoint.class.st | 72 +++++++++++++++++++ .../README.md => OGC-Core/OGCPolygon.class.st | 9 ++- .../README.md => OGC-Core/OGCSurface.class.st | 9 ++- OGC-Core/package.st | 1 + 67 files changed, 219 insertions(+), 264 deletions(-) delete mode 100644 BaselineOfOGC.package/.filetree delete mode 100644 BaselineOfOGC.package/BaselineOfOGC.class/README.md delete mode 100644 BaselineOfOGC.package/BaselineOfOGC.class/properties.json delete mode 100644 BaselineOfOGC.package/monticello.meta/categories.st delete mode 100644 BaselineOfOGC.package/monticello.meta/initializers.st delete mode 100644 BaselineOfOGC.package/monticello.meta/package delete mode 100644 BaselineOfOGC.package/properties.json rename BaselineOfOGC.package/BaselineOfOGC.class/instance/baseline..st => BaselineOfOGC/BaselineOfOGC.class.st (64%) create mode 100644 BaselineOfOGC/package.st delete mode 100644 OGC-Core-Tests.package/.filetree delete mode 100644 OGC-Core-Tests.package/OGCPointTest.class/README.md delete mode 100644 OGC-Core-Tests.package/OGCPointTest.class/instance/testPointGeometricType.st delete mode 100644 OGC-Core-Tests.package/OGCPointTest.class/instance/testPointHasNoDimension.st delete mode 100644 OGC-Core-Tests.package/OGCPointTest.class/properties.json delete mode 100644 OGC-Core-Tests.package/monticello.meta/categories.st delete mode 100644 OGC-Core-Tests.package/monticello.meta/initializers.st delete mode 100644 OGC-Core-Tests.package/monticello.meta/package delete mode 100644 OGC-Core-Tests.package/properties.json create mode 100644 OGC-Core-Tests/OGCPointTest.class.st create mode 100644 OGC-Core-Tests/package.st delete mode 100644 OGC-Core.package/.filetree delete mode 100644 OGC-Core.package/OGCCurve.class/properties.json delete mode 100644 OGC-Core.package/OGCGeometry.class/instance/dimension.st delete mode 100644 OGC-Core.package/OGCGeometry.class/instance/geometryType.st delete mode 100644 OGC-Core.package/OGCGeometry.class/instance/is3D.st delete mode 100644 OGC-Core.package/OGCGeometry.class/instance/isEmpty.st delete mode 100644 OGC-Core.package/OGCGeometry.class/properties.json delete mode 100644 OGC-Core.package/OGCGeometryCollection.class/properties.json delete mode 100644 OGC-Core.package/OGCLine.class/README.md delete mode 100644 OGC-Core.package/OGCLine.class/properties.json delete mode 100644 OGC-Core.package/OGCLineString.class/properties.json delete mode 100644 OGC-Core.package/OGCLinearRing.class/properties.json delete mode 100644 OGC-Core.package/OGCMultiCurve.class/properties.json delete mode 100644 OGC-Core.package/OGCMultiPoint.class/properties.json delete mode 100644 OGC-Core.package/OGCMultiSurface.class/properties.json delete mode 100644 OGC-Core.package/OGCPoint.class/README.md delete mode 100644 OGC-Core.package/OGCPoint.class/class/geometryType.st delete mode 100644 OGC-Core.package/OGCPoint.class/class/x.y..st delete mode 100644 OGC-Core.package/OGCPoint.class/instance/dimension.st delete mode 100644 OGC-Core.package/OGCPoint.class/instance/printOn..st delete mode 100644 OGC-Core.package/OGCPoint.class/instance/x..st delete mode 100644 OGC-Core.package/OGCPoint.class/instance/x.st delete mode 100644 OGC-Core.package/OGCPoint.class/instance/y..st delete mode 100644 OGC-Core.package/OGCPoint.class/instance/y.st delete mode 100644 OGC-Core.package/OGCPoint.class/instance/z..st delete mode 100644 OGC-Core.package/OGCPoint.class/instance/z.st delete mode 100644 OGC-Core.package/OGCPoint.class/properties.json delete mode 100644 OGC-Core.package/OGCPolygon.class/properties.json delete mode 100644 OGC-Core.package/OGCSurface.class/properties.json delete mode 100644 OGC-Core.package/monticello.meta/categories.st delete mode 100644 OGC-Core.package/monticello.meta/initializers.st delete mode 100644 OGC-Core.package/monticello.meta/package delete mode 100644 OGC-Core.package/properties.json rename OGC-Core.package/OGCCurve.class/README.md => OGC-Core/OGCCurve.class.st (62%) rename OGC-Core.package/OGCGeometry.class/README.md => OGC-Core/OGCGeometry.class.st (71%) rename OGC-Core.package/OGCGeometryCollection.class/README.md => OGC-Core/OGCGeometryCollection.class.st (82%) create mode 100644 OGC-Core/OGCLine.class.st rename OGC-Core.package/OGCLineString.class/README.md => OGC-Core/OGCLineString.class.st (63%) rename OGC-Core.package/OGCLinearRing.class/README.md => OGC-Core/OGCLinearRing.class.st (64%) rename OGC-Core.package/OGCMultiCurve.class/README.md => OGC-Core/OGCMultiCurve.class.st (84%) rename OGC-Core.package/OGCMultiPoint.class/README.md => OGC-Core/OGCMultiPoint.class.st (75%) rename OGC-Core.package/OGCMultiSurface.class/README.md => OGC-Core/OGCMultiSurface.class.st (87%) create mode 100644 OGC-Core/OGCPoint.class.st rename OGC-Core.package/OGCPolygon.class/README.md => OGC-Core/OGCPolygon.class.st (89%) rename OGC-Core.package/OGCSurface.class/README.md => OGC-Core/OGCSurface.class.st (79%) create mode 100644 OGC-Core/package.st diff --git a/.properties b/.properties index c2bedd4..ad0471d 100644 --- a/.properties +++ b/.properties @@ -1,3 +1,3 @@ { - #format : #filetree + #format : #tonel } \ No newline at end of file diff --git a/BaselineOfOGC.package/.filetree b/BaselineOfOGC.package/.filetree deleted file mode 100644 index 57a6797..0000000 --- a/BaselineOfOGC.package/.filetree +++ /dev/null @@ -1,5 +0,0 @@ -{ - "separateMethodMetaAndSource" : false, - "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file diff --git a/BaselineOfOGC.package/BaselineOfOGC.class/README.md b/BaselineOfOGC.package/BaselineOfOGC.class/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/BaselineOfOGC.package/BaselineOfOGC.class/properties.json b/BaselineOfOGC.package/BaselineOfOGC.class/properties.json deleted file mode 100644 index f9c9e4a..0000000 --- a/BaselineOfOGC.package/BaselineOfOGC.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "", - "super" : "BaselineOf", - "category" : "BaselineOfOGC", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "BaselineOfOGC", - "type" : "normal" -} \ No newline at end of file diff --git a/BaselineOfOGC.package/monticello.meta/categories.st b/BaselineOfOGC.package/monticello.meta/categories.st deleted file mode 100644 index 768e208..0000000 --- a/BaselineOfOGC.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #BaselineOfOGC! diff --git a/BaselineOfOGC.package/monticello.meta/initializers.st b/BaselineOfOGC.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29..0000000 diff --git a/BaselineOfOGC.package/monticello.meta/package b/BaselineOfOGC.package/monticello.meta/package deleted file mode 100644 index c53c329..0000000 --- a/BaselineOfOGC.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'BaselineOfOGC') \ No newline at end of file diff --git a/BaselineOfOGC.package/properties.json b/BaselineOfOGC.package/properties.json deleted file mode 100644 index 6f31cf5..0000000 --- a/BaselineOfOGC.package/properties.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/BaselineOfOGC.package/BaselineOfOGC.class/instance/baseline..st b/BaselineOfOGC/BaselineOfOGC.class.st similarity index 64% rename from BaselineOfOGC.package/BaselineOfOGC.class/instance/baseline..st rename to BaselineOfOGC/BaselineOfOGC.class.st index 99fede6..620158c 100644 --- a/BaselineOfOGC.package/BaselineOfOGC.class/instance/baseline..st +++ b/BaselineOfOGC/BaselineOfOGC.class.st @@ -1,5 +1,11 @@ -baselines -baseline: spec +Class { + #name : #BaselineOfOGC, + #superclass : #BaselineOf, + #category : 'BaselineOfOGC' +} + +{ #category : #baselines } +BaselineOfOGC >> baseline: spec [ spec for: #'common' do: [ @@ -11,3 +17,5 @@ baseline: spec group: 'Core' with: #('OGC-Core' ); group: 'Tests' with: #('OGC-Core-Tests'); group: 'default' with: #('Core' 'Tests'). ]. + +] diff --git a/BaselineOfOGC/package.st b/BaselineOfOGC/package.st new file mode 100644 index 0000000..f182446 --- /dev/null +++ b/BaselineOfOGC/package.st @@ -0,0 +1 @@ +Package { #name : #BaselineOfOGC } diff --git a/OGC-Core-Tests.package/.filetree b/OGC-Core-Tests.package/.filetree deleted file mode 100644 index 57a6797..0000000 --- a/OGC-Core-Tests.package/.filetree +++ /dev/null @@ -1,5 +0,0 @@ -{ - "separateMethodMetaAndSource" : false, - "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file diff --git a/OGC-Core-Tests.package/OGCPointTest.class/README.md b/OGC-Core-Tests.package/OGCPointTest.class/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/OGC-Core-Tests.package/OGCPointTest.class/instance/testPointGeometricType.st b/OGC-Core-Tests.package/OGCPointTest.class/instance/testPointGeometricType.st deleted file mode 100644 index ce1c965..0000000 --- a/OGC-Core-Tests.package/OGCPointTest.class/instance/testPointGeometricType.st +++ /dev/null @@ -1,5 +0,0 @@ -tests -testPointGeometricType - | p | - p := OGCPoint new. - self assert: p geometryType equals: 'Point' \ No newline at end of file diff --git a/OGC-Core-Tests.package/OGCPointTest.class/instance/testPointHasNoDimension.st b/OGC-Core-Tests.package/OGCPointTest.class/instance/testPointHasNoDimension.st deleted file mode 100644 index 1e74b41..0000000 --- a/OGC-Core-Tests.package/OGCPointTest.class/instance/testPointHasNoDimension.st +++ /dev/null @@ -1,7 +0,0 @@ -tests -testPointHasNoDimension - | p | - p := OGCPoint new - x: 0; - y: 0. - self assert: p dimension equals: 0 \ No newline at end of file diff --git a/OGC-Core-Tests.package/OGCPointTest.class/properties.json b/OGC-Core-Tests.package/OGCPointTest.class/properties.json deleted file mode 100644 index 0691c3a..0000000 --- a/OGC-Core-Tests.package/OGCPointTest.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "", - "super" : "TestCase", - "category" : "OGC-Core-Tests", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCPointTest", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core-Tests.package/monticello.meta/categories.st b/OGC-Core-Tests.package/monticello.meta/categories.st deleted file mode 100644 index 31967c8..0000000 --- a/OGC-Core-Tests.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #'OGC-Core-Tests'! diff --git a/OGC-Core-Tests.package/monticello.meta/initializers.st b/OGC-Core-Tests.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29..0000000 diff --git a/OGC-Core-Tests.package/monticello.meta/package b/OGC-Core-Tests.package/monticello.meta/package deleted file mode 100644 index 8d1046a..0000000 --- a/OGC-Core-Tests.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'OGC-Core-Tests') \ No newline at end of file diff --git a/OGC-Core-Tests.package/properties.json b/OGC-Core-Tests.package/properties.json deleted file mode 100644 index 6f31cf5..0000000 --- a/OGC-Core-Tests.package/properties.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/OGC-Core-Tests/OGCPointTest.class.st b/OGC-Core-Tests/OGCPointTest.class.st new file mode 100644 index 0000000..0ad1a3e --- /dev/null +++ b/OGC-Core-Tests/OGCPointTest.class.st @@ -0,0 +1,21 @@ +Class { + #name : #OGCPointTest, + #superclass : #TestCase, + #category : 'OGC-Core-Tests' +} + +{ #category : #tests } +OGCPointTest >> testPointGeometricType [ + | p | + p := OGCPoint new. + self assert: p geometryType equals: 'Point' +] + +{ #category : #tests } +OGCPointTest >> testPointHasNoDimension [ + | p | + p := OGCPoint new + x: 0; + y: 0. + self assert: p dimension equals: 0 +] diff --git a/OGC-Core-Tests/package.st b/OGC-Core-Tests/package.st new file mode 100644 index 0000000..b9eac96 --- /dev/null +++ b/OGC-Core-Tests/package.st @@ -0,0 +1 @@ +Package { #name : #'OGC-Core-Tests' } diff --git a/OGC-Core.package/.filetree b/OGC-Core.package/.filetree deleted file mode 100644 index 57a6797..0000000 --- a/OGC-Core.package/.filetree +++ /dev/null @@ -1,5 +0,0 @@ -{ - "separateMethodMetaAndSource" : false, - "noMethodMetaData" : true, - "useCypressPropertiesFile" : true -} \ No newline at end of file diff --git a/OGC-Core.package/OGCCurve.class/properties.json b/OGC-Core.package/OGCCurve.class/properties.json deleted file mode 100644 index 378f328..0000000 --- a/OGC-Core.package/OGCCurve.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:50", - "super" : "OGCGeometry", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCCurve", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCGeometry.class/instance/dimension.st b/OGC-Core.package/OGCGeometry.class/instance/dimension.st deleted file mode 100644 index 3aadcc0..0000000 --- a/OGC-Core.package/OGCGeometry.class/instance/dimension.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -dimension - self subclassResponsibility \ No newline at end of file diff --git a/OGC-Core.package/OGCGeometry.class/instance/geometryType.st b/OGC-Core.package/OGCGeometry.class/instance/geometryType.st deleted file mode 100644 index 4846847..0000000 --- a/OGC-Core.package/OGCGeometry.class/instance/geometryType.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -geometryType - ^ self class geometryType \ No newline at end of file diff --git a/OGC-Core.package/OGCGeometry.class/instance/is3D.st b/OGC-Core.package/OGCGeometry.class/instance/is3D.st deleted file mode 100644 index 6274db8..0000000 --- a/OGC-Core.package/OGCGeometry.class/instance/is3D.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -is3D - self subclassResponsibility \ No newline at end of file diff --git a/OGC-Core.package/OGCGeometry.class/instance/isEmpty.st b/OGC-Core.package/OGCGeometry.class/instance/isEmpty.st deleted file mode 100644 index 2ea3845..0000000 --- a/OGC-Core.package/OGCGeometry.class/instance/isEmpty.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -isEmpty - self subclassResponsibility \ No newline at end of file diff --git a/OGC-Core.package/OGCGeometry.class/properties.json b/OGC-Core.package/OGCGeometry.class/properties.json deleted file mode 100644 index ba287ca..0000000 --- a/OGC-Core.package/OGCGeometry.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 13:47", - "super" : "Object", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCGeometry", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCGeometryCollection.class/properties.json b/OGC-Core.package/OGCGeometryCollection.class/properties.json deleted file mode 100644 index 431f5e9..0000000 --- a/OGC-Core.package/OGCGeometryCollection.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:49", - "super" : "OGCGeometry", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCGeometryCollection", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCLine.class/README.md b/OGC-Core.package/OGCLine.class/README.md deleted file mode 100644 index 640a134..0000000 --- a/OGC-Core.package/OGCLine.class/README.md +++ /dev/null @@ -1,5 +0,0 @@ -6.1.7 LineString, Line, LinearRing - -6.1.7.1 Description - -A Line is a LineString with exactly 2 Points. \ No newline at end of file diff --git a/OGC-Core.package/OGCLine.class/properties.json b/OGC-Core.package/OGCLine.class/properties.json deleted file mode 100644 index d92bdbc..0000000 --- a/OGC-Core.package/OGCLine.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:51", - "super" : "OGCLineString", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCLine", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCLineString.class/properties.json b/OGC-Core.package/OGCLineString.class/properties.json deleted file mode 100644 index e49d6f6..0000000 --- a/OGC-Core.package/OGCLineString.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:51", - "super" : "OGCCurve", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCLineString", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCLinearRing.class/properties.json b/OGC-Core.package/OGCLinearRing.class/properties.json deleted file mode 100644 index 7676a7e..0000000 --- a/OGC-Core.package/OGCLinearRing.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:51", - "super" : "OGCLineString", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCLinearRing", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCMultiCurve.class/properties.json b/OGC-Core.package/OGCMultiCurve.class/properties.json deleted file mode 100644 index 289c356..0000000 --- a/OGC-Core.package/OGCMultiCurve.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:52", - "super" : "OGCGeometryCollection", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCMultiCurve", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCMultiPoint.class/properties.json b/OGC-Core.package/OGCMultiPoint.class/properties.json deleted file mode 100644 index dbcd6ed..0000000 --- a/OGC-Core.package/OGCMultiPoint.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:49", - "super" : "OGCGeometryCollection", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCMultiPoint", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCMultiSurface.class/properties.json b/OGC-Core.package/OGCMultiSurface.class/properties.json deleted file mode 100644 index 71d6e83..0000000 --- a/OGC-Core.package/OGCMultiSurface.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:53", - "super" : "OGCGeometryCollection", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCMultiSurface", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/README.md b/OGC-Core.package/OGCPoint.class/README.md deleted file mode 100644 index 9de0e18..0000000 --- a/OGC-Core.package/OGCPoint.class/README.md +++ /dev/null @@ -1,8 +0,0 @@ -6.1.4 Point - -6.1.4.1 Description - -A Point is a 0-dimensional geometric object and represents a single location in coordinate space. A Point has an -x-coordinate value, a y-coordinate value. If called for by the associated Spatial Reference System, it may also -have coordinate values for z and m. -The boundary of a Point is the empty set. \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/class/geometryType.st b/OGC-Core.package/OGCPoint.class/class/geometryType.st deleted file mode 100644 index 298531d..0000000 --- a/OGC-Core.package/OGCPoint.class/class/geometryType.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -geometryType - ^ 'Point' \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/class/x.y..st b/OGC-Core.package/OGCPoint.class/class/x.y..st deleted file mode 100644 index a2b8896..0000000 --- a/OGC-Core.package/OGCPoint.class/class/x.y..st +++ /dev/null @@ -1,5 +0,0 @@ -instance creation -x: xNumber y: yNumber - ^ self new - x: xNumber; - y: yNumber \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/instance/dimension.st b/OGC-Core.package/OGCPoint.class/instance/dimension.st deleted file mode 100644 index 2e67caa..0000000 --- a/OGC-Core.package/OGCPoint.class/instance/dimension.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -dimension - ^ 0 \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/instance/printOn..st b/OGC-Core.package/OGCPoint.class/instance/printOn..st deleted file mode 100644 index b266c66..0000000 --- a/OGC-Core.package/OGCPoint.class/instance/printOn..st +++ /dev/null @@ -1,3 +0,0 @@ -printing -printOn: aStream - aStream << x asString << ',' << y asString \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/instance/x..st b/OGC-Core.package/OGCPoint.class/instance/x..st deleted file mode 100644 index 1e01dd8..0000000 --- a/OGC-Core.package/OGCPoint.class/instance/x..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -x: aFloat - x:= aFloat \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/instance/x.st b/OGC-Core.package/OGCPoint.class/instance/x.st deleted file mode 100644 index 197a269..0000000 --- a/OGC-Core.package/OGCPoint.class/instance/x.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -x - ^ x \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/instance/y..st b/OGC-Core.package/OGCPoint.class/instance/y..st deleted file mode 100644 index e9c478b..0000000 --- a/OGC-Core.package/OGCPoint.class/instance/y..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -y: aFloat - y:= aFloat \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/instance/y.st b/OGC-Core.package/OGCPoint.class/instance/y.st deleted file mode 100644 index d325d02..0000000 --- a/OGC-Core.package/OGCPoint.class/instance/y.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -y - ^ y \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/instance/z..st b/OGC-Core.package/OGCPoint.class/instance/z..st deleted file mode 100644 index 51a7d01..0000000 --- a/OGC-Core.package/OGCPoint.class/instance/z..st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -z: aFloat - z := aFloat \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/instance/z.st b/OGC-Core.package/OGCPoint.class/instance/z.st deleted file mode 100644 index bdd2106..0000000 --- a/OGC-Core.package/OGCPoint.class/instance/z.st +++ /dev/null @@ -1,3 +0,0 @@ -accessing -z - ^ z \ No newline at end of file diff --git a/OGC-Core.package/OGCPoint.class/properties.json b/OGC-Core.package/OGCPoint.class/properties.json deleted file mode 100644 index 54ab809..0000000 --- a/OGC-Core.package/OGCPoint.class/properties.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:49", - "super" : "OGCGeometry", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ - "x", - "y", - "z" - ], - "name" : "OGCPoint", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCPolygon.class/properties.json b/OGC-Core.package/OGCPolygon.class/properties.json deleted file mode 100644 index f73ce22..0000000 --- a/OGC-Core.package/OGCPolygon.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:53", - "super" : "OGCSurface", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCPolygon", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/OGCSurface.class/properties.json b/OGC-Core.package/OGCSurface.class/properties.json deleted file mode 100644 index 0679a43..0000000 --- a/OGC-Core.package/OGCSurface.class/properties.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "commentStamp" : "NorbertHartl 7/1/2020 17:52", - "super" : "OGCGeometry", - "category" : "OGC-Core", - "classinstvars" : [ ], - "pools" : [ ], - "classvars" : [ ], - "instvars" : [ ], - "name" : "OGCSurface", - "type" : "normal" -} \ No newline at end of file diff --git a/OGC-Core.package/monticello.meta/categories.st b/OGC-Core.package/monticello.meta/categories.st deleted file mode 100644 index f57b591..0000000 --- a/OGC-Core.package/monticello.meta/categories.st +++ /dev/null @@ -1 +0,0 @@ -SystemOrganization addCategory: #'OGC-Core'! diff --git a/OGC-Core.package/monticello.meta/initializers.st b/OGC-Core.package/monticello.meta/initializers.st deleted file mode 100644 index e69de29..0000000 diff --git a/OGC-Core.package/monticello.meta/package b/OGC-Core.package/monticello.meta/package deleted file mode 100644 index ca9f386..0000000 --- a/OGC-Core.package/monticello.meta/package +++ /dev/null @@ -1 +0,0 @@ -(name 'OGC-Core') \ No newline at end of file diff --git a/OGC-Core.package/properties.json b/OGC-Core.package/properties.json deleted file mode 100644 index 6f31cf5..0000000 --- a/OGC-Core.package/properties.json +++ /dev/null @@ -1 +0,0 @@ -{ } \ No newline at end of file diff --git a/OGC-Core.package/OGCCurve.class/README.md b/OGC-Core/OGCCurve.class.st similarity index 62% rename from OGC-Core.package/OGCCurve.class/README.md rename to OGC-Core/OGCCurve.class.st index bc774cb..cfaf6fc 100644 --- a/OGC-Core.package/OGCCurve.class/README.md +++ b/OGC-Core/OGCCurve.class.st @@ -1,7 +1,14 @@ +" 6.1.6 Curve 6.1.6.1 Description A Curve is a 1-dimensional geometric object usually stored as a sequence of Points, with the subtype of Curve specifying the form of the interpolation between Points. This standard defines only one subclass of Curve, -LineString, which uses linear interpolation between Points. \ No newline at end of file +LineString, which uses linear interpolation between Points. +" +Class { + #name : #OGCCurve, + #superclass : #OGCGeometry, + #category : 'OGC-Core' +} diff --git a/OGC-Core.package/OGCGeometry.class/README.md b/OGC-Core/OGCGeometry.class.st similarity index 71% rename from OGC-Core.package/OGCGeometry.class/README.md rename to OGC-Core/OGCGeometry.class.st index 4ac38e4..9d1087b 100644 --- a/OGC-Core.package/OGCGeometry.class/README.md +++ b/OGC-Core/OGCGeometry.class.st @@ -1,3 +1,4 @@ +" 6.1.2 Geometry 6.1.2.1 Description @@ -13,4 +14,30 @@ be unambiguously associated to a coordinate reference system either directly or The z coordinate of a point is typically, but not necessarily, represents altitude or elevation. The m coordinate represents a measurement. All Geometry classes described in this standard are defined so that instances of Geometry are topologically -closed, i.e. all represented geometries include their boundary as point sets. This does not affect their \ No newline at end of file +closed, i.e. all represented geometries include their boundary as point sets. This does not affect their +" +Class { + #name : #OGCGeometry, + #superclass : #Object, + #category : 'OGC-Core' +} + +{ #category : #accessing } +OGCGeometry >> dimension [ + self subclassResponsibility +] + +{ #category : #accessing } +OGCGeometry >> geometryType [ + ^ self class geometryType +] + +{ #category : #accessing } +OGCGeometry >> is3D [ + self subclassResponsibility +] + +{ #category : #accessing } +OGCGeometry >> isEmpty [ + self subclassResponsibility +] diff --git a/OGC-Core.package/OGCGeometryCollection.class/README.md b/OGC-Core/OGCGeometryCollection.class.st similarity index 82% rename from OGC-Core.package/OGCGeometryCollection.class/README.md rename to OGC-Core/OGCGeometryCollection.class.st index 11f6912..ab86435 100644 --- a/OGC-Core.package/OGCGeometryCollection.class/README.md +++ b/OGC-Core/OGCGeometryCollection.class.st @@ -1,3 +1,4 @@ +" 6.1.3 GeometryCollection 6.1.3.1 Description @@ -7,4 +8,10 @@ All the elements in a GeometryCollection shall be in the same Spatial Reference Reference System for the GeometryCollection. GeometryCollection places no other constraints on its elements. Subclasses of GeometryCollection may restrict membership based on dimension and may also place other constraints on the degree of spatial overlap between -elements. \ No newline at end of file +elements. +" +Class { + #name : #OGCGeometryCollection, + #superclass : #OGCGeometry, + #category : 'OGC-Core' +} diff --git a/OGC-Core/OGCLine.class.st b/OGC-Core/OGCLine.class.st new file mode 100644 index 0000000..c6b9eb6 --- /dev/null +++ b/OGC-Core/OGCLine.class.st @@ -0,0 +1,12 @@ +" +6.1.7 LineString, Line, LinearRing + +6.1.7.1 Description + +A Line is a LineString with exactly 2 Points. +" +Class { + #name : #OGCLine, + #superclass : #OGCLineString, + #category : 'OGC-Core' +} diff --git a/OGC-Core.package/OGCLineString.class/README.md b/OGC-Core/OGCLineString.class.st similarity index 63% rename from OGC-Core.package/OGCLineString.class/README.md rename to OGC-Core/OGCLineString.class.st index 4ce8b86..0a87a9a 100644 --- a/OGC-Core.package/OGCLineString.class/README.md +++ b/OGC-Core/OGCLineString.class.st @@ -1,6 +1,13 @@ +" 6.1.7 LineString, Line, LinearRing 6.1.7.1 Description A LineString is a Curve with linear interpolation between Points. Each consecutive pair of Points defines a Line -segment. \ No newline at end of file +segment. +" +Class { + #name : #OGCLineString, + #superclass : #OGCCurve, + #category : 'OGC-Core' +} diff --git a/OGC-Core.package/OGCLinearRing.class/README.md b/OGC-Core/OGCLinearRing.class.st similarity index 64% rename from OGC-Core.package/OGCLinearRing.class/README.md rename to OGC-Core/OGCLinearRing.class.st index 0cf0e14..a75a1a3 100644 --- a/OGC-Core.package/OGCLinearRing.class/README.md +++ b/OGC-Core/OGCLinearRing.class.st @@ -1,6 +1,13 @@ +" 6.1.7 LineString, Line, LinearRing 6.1.7.1 Description A LinearRing is a LineString that is both closed and simple. The Curve in Figure 2, item (c), is a closed LineString -that is a LinearRing. The Curve in Figure 2, item (d) is a closed LineString that is not a LinearRing. \ No newline at end of file +that is a LinearRing. The Curve in Figure 2, item (d) is a closed LineString that is not a LinearRing. +" +Class { + #name : #OGCLinearRing, + #superclass : #OGCLineString, + #category : 'OGC-Core' +} diff --git a/OGC-Core.package/OGCMultiCurve.class/README.md b/OGC-Core/OGCMultiCurve.class.st similarity index 84% rename from OGC-Core.package/OGCMultiCurve.class/README.md rename to OGC-Core/OGCMultiCurve.class.st index 72bbe24..dbc7514 100644 --- a/OGC-Core.package/OGCMultiCurve.class/README.md +++ b/OGC-Core/OGCMultiCurve.class.st @@ -1,3 +1,4 @@ +" 6.1.8 MultiCurve 6.1.8.1 Description @@ -12,4 +13,10 @@ The boundary of a MultiCurve is obtained by applying the “mod 2” union rule: MultiCurve if it is in the boundaries of an odd number of elements of the MultiCurve (Reference [1], section 3.12.3.2). A MultiCurve is closed if all of its elements are closed. The boundary of a closed MultiCurve is always empty. -A MultiCurve is defined as topologically closed. \ No newline at end of file +A MultiCurve is defined as topologically closed. +" +Class { + #name : #OGCMultiCurve, + #superclass : #OGCGeometryCollection, + #category : 'OGC-Core' +} diff --git a/OGC-Core.package/OGCMultiPoint.class/README.md b/OGC-Core/OGCMultiPoint.class.st similarity index 75% rename from OGC-Core.package/OGCMultiPoint.class/README.md rename to OGC-Core/OGCMultiPoint.class.st index 3c4f198..bba1363 100644 --- a/OGC-Core.package/OGCMultiPoint.class/README.md +++ b/OGC-Core/OGCMultiPoint.class.st @@ -1,3 +1,4 @@ +" 6.1.5 MultiPoint A MultiPoint is a 0-dimensional GeometryCollection. The elements of a MultiPoint are restricted to Points. The @@ -5,4 +6,10 @@ Points are not connected or ordered in any semantically important way (see the d GeometryCollection). A MultiPoint is simple if no two Points in the MultiPoint are equal (have identical coordinate values in X and Y). Every MultiPoint is spatially equal under the definition in Clause 6.1.15.3 to a simple Multipoint. -The boundary of a MultiPoint is the empty set. \ No newline at end of file +The boundary of a MultiPoint is the empty set. +" +Class { + #name : #OGCMultiPoint, + #superclass : #OGCGeometryCollection, + #category : 'OGC-Core' +} diff --git a/OGC-Core.package/OGCMultiSurface.class/README.md b/OGC-Core/OGCMultiSurface.class.st similarity index 87% rename from OGC-Core.package/OGCMultiSurface.class/README.md rename to OGC-Core/OGCMultiSurface.class.st index 5b841d5..6a31940 100644 --- a/OGC-Core.package/OGCMultiSurface.class/README.md +++ b/OGC-Core/OGCMultiSurface.class.st @@ -1,3 +1,4 @@ +" 6.1.13 MultiSurface 6.1.13.1 Description @@ -10,4 +11,10 @@ single surface. MultiSurface is an instantiable class in this Standard, and may be used to represent heterogeneous surfaces collections of polygons and polyhedral surfaces. It defines a set of methods for its subclasses. The subclass of MultiSurface is MultiPolygon corresponding to a collection of Polygons only. Other collections shall use -MultiSurface. \ No newline at end of file +MultiSurface. +" +Class { + #name : #OGCMultiSurface, + #superclass : #OGCGeometryCollection, + #category : 'OGC-Core' +} diff --git a/OGC-Core/OGCPoint.class.st b/OGC-Core/OGCPoint.class.st new file mode 100644 index 0000000..3a3924b --- /dev/null +++ b/OGC-Core/OGCPoint.class.st @@ -0,0 +1,72 @@ +" +6.1.4 Point + +6.1.4.1 Description + +A Point is a 0-dimensional geometric object and represents a single location in coordinate space. A Point has an +x-coordinate value, a y-coordinate value. If called for by the associated Spatial Reference System, it may also +have coordinate values for z and m. +The boundary of a Point is the empty set. +" +Class { + #name : #OGCPoint, + #superclass : #OGCGeometry, + #instVars : [ + 'x', + 'y', + 'z' + ], + #category : 'OGC-Core' +} + +{ #category : #accessing } +OGCPoint class >> geometryType [ + ^ 'Point' +] + +{ #category : #'instance creation' } +OGCPoint class >> x: xNumber y: yNumber [ + ^ self new + x: xNumber; + y: yNumber +] + +{ #category : #accessing } +OGCPoint >> dimension [ + ^ 0 +] + +{ #category : #printing } +OGCPoint >> printOn: aStream [ + aStream << x asString << ',' << y asString +] + +{ #category : #accessing } +OGCPoint >> x [ + ^ x +] + +{ #category : #accessing } +OGCPoint >> x: aFloat [ + x:= aFloat +] + +{ #category : #accessing } +OGCPoint >> y [ + ^ y +] + +{ #category : #accessing } +OGCPoint >> y: aFloat [ + y:= aFloat +] + +{ #category : #accessing } +OGCPoint >> z [ + ^ z +] + +{ #category : #accessing } +OGCPoint >> z: aFloat [ + z := aFloat +] diff --git a/OGC-Core.package/OGCPolygon.class/README.md b/OGC-Core/OGCPolygon.class.st similarity index 89% rename from OGC-Core.package/OGCPolygon.class/README.md rename to OGC-Core/OGCPolygon.class.st index 77986cf..b0ea4d9 100644 --- a/OGC-Core.package/OGCPolygon.class/README.md +++ b/OGC-Core/OGCPolygon.class.st @@ -1,3 +1,4 @@ +" 6.1.11 Polygon, Triangle 6.1.11.1 Description @@ -12,4 +13,10 @@ The assertions for Polygons (the rules that define valid Polygons) are as follow a) Polygons are topologically closed; b) The boundary of a Polygon consists of a set of LinearRings that make up its exterior and interior boundaries; c) No two Rings in the boundary cross and the Rings in the boundary of a Polygon may intersect at a Point but -only as a tangent, e.g. \ No newline at end of file +only as a tangent, e.g. +" +Class { + #name : #OGCPolygon, + #superclass : #OGCSurface, + #category : 'OGC-Core' +} diff --git a/OGC-Core.package/OGCSurface.class/README.md b/OGC-Core/OGCSurface.class.st similarity index 79% rename from OGC-Core.package/OGCSurface.class/README.md rename to OGC-Core/OGCSurface.class.st index 5772bec..e17c000 100644 --- a/OGC-Core.package/OGCSurface.class/README.md +++ b/OGC-Core/OGCSurface.class.st @@ -1,3 +1,4 @@ +" 6.1.10 Surface 6.1.10.1 Description @@ -6,4 +7,10 @@ A Surface is a 2-dimensional geometric object. A simple Surface may consists of a single “patch” that is associated with one “exterior boundary” and 0 or more “interior” boundaries. A single such Surface patch in 3-dimensional space is isometric to planar Surfaces, by a simple affine rotation matrix that rotates the patch onto the plane z = 0. If the patch is not vertical, the projection -onto the same plane is an isomorphism, and can be represented as a linear transformation, i.e. an affine. \ No newline at end of file +onto the same plane is an isomorphism, and can be represented as a linear transformation, i.e. an affine. +" +Class { + #name : #OGCSurface, + #superclass : #OGCGeometry, + #category : 'OGC-Core' +} diff --git a/OGC-Core/package.st b/OGC-Core/package.st new file mode 100644 index 0000000..25b707b --- /dev/null +++ b/OGC-Core/package.st @@ -0,0 +1 @@ +Package { #name : #'OGC-Core' }