Dev jogm

GISLibrary/AlertCommands.cpp

@@ -30,6 +30,10 @@ namespace DrawingInstructions
 	AlertReference::AlertReference(std::string alertReference, std::string plan, std::string monitor)
 		: alertReference(alertReference), plan(plan), monitor(monitor) {}
 
+	void AlertReference::init()
+	{
+	}
+
 	void AlertReference::execute()  {
 	}
 	void AlertReference::parse(const std::string& input)

GISLibrary/AlertCommands.h

@@ -5,7 +5,9 @@ namespace DrawingInstructions
 {
 	class AlertReference : public StateCommand {
 	public:
+		AlertReference() = default;
 		AlertReference(std::string alertReference, std::string plan, std::string monitor);
+		virtual void init() override;
 		virtual void execute() override;
 		virtual void parse(const std::string& input) override;
 	private:

GISLibrary/ColourOverrideCommands.cpp

@@ -52,6 +52,10 @@ namespace DrawingInstructions
 	OverrideColor::OverrideColor(const std::string& colorToken, double colorTransparency, const std::string& overrideToken, double overrideTransparency)
 		: colorToken(colorToken), colorTransparency(colorTransparency), overrideToken(overrideToken), overrideTransparency(overrideTransparency) {}
 
+	void OverrideColor::init()
+	{
+	}
+
 	void OverrideColor::execute()
 	{
 	}
@@ -63,6 +67,11 @@ namespace DrawingInstructions
 
 	OverrideAll::OverrideAll(const std::string& token, double transparency)
 		: token(token), transparency(transparency) {}
+
+	void OverrideAll::init()
+	{
+	}
+
 	void OverrideAll::execute()  {
 	}
 	void OverrideAll::parse(const std::string& input)

GISLibrary/ColourOverrideCommands.h

@@ -3,9 +3,14 @@
 
 namespace DrawingInstructions
 {
-    class OverrideColor : public StateCommand {
+    class OverrideColor : public StateCommand 
+    {
     public:
+		OverrideColor() = default;
         OverrideColor(const std::string& colorToken, double colorTransparency, const std::string& overrideToken, double overrideTransparency);
+
+    public:
+		void init() override;
         void execute() override;
         void parse(const std::string& input) override;
 
@@ -16,9 +21,14 @@ namespace DrawingInstructions
         double overrideTransparency;
     };
 
-    class OverrideAll : public StateCommand {
+    class OverrideAll : public StateCommand 
+    {
     public:
+		OverrideAll() = default;
         OverrideAll(const std::string& token, double transparency);
+
+    public:
+		void init() override;
         void execute() override;
         void parse(const std::string& input) override;
 

GISLibrary/CoverageCommands.cpp

@@ -71,6 +71,11 @@ namespace DrawingInstructions {
 	NumericAnnotation::NumericAnnotation(int decimals, const std::string& championChoice, double buffer)
 		: decimals(decimals), championChoice(championChoice), buffer(buffer) {}
 
+	void NumericAnnotation::init() 
+	{
+
+	}
+
 	void NumericAnnotation::execute()  {
 	}
 
@@ -81,6 +86,11 @@ namespace DrawingInstructions {
 	SymbolAnnotation::SymbolAnnotation(const std::string& symbolRef, const std::string& rotationAttribute, const std::string& scaleAttribute, const std::string& rotationCRS, double rotationOffset, double rotationFactor, double scaleFactor)
 		: symbolRef(symbolRef), rotationAttribute(rotationAttribute), scaleAttribute(scaleAttribute), rotationCRS(rotationCRS), rotationOffset(rotationOffset), rotationFactor(rotationFactor), scaleFactor(scaleFactor) {}
 
+	void SymbolAnnotation::init()
+	{
+
+	}
+
 	void SymbolAnnotation::execute()  {
 	}
 
@@ -91,6 +101,11 @@ namespace DrawingInstructions {
 	CoverageColor::CoverageColor(const std::string& startToken, double startTransparency, const std::string& endToken, double endTransparency, double penWidth)
 		: startToken(startToken), startTransparency(startTransparency), endToken(endToken), endTransparency(endTransparency), penWidth(penWidth) {}
 
+	void CoverageColor::init()
+	{
+
+	}
+
 	void CoverageColor::execute()  {
 	}
 
@@ -101,6 +116,14 @@ namespace DrawingInstructions {
 	LookupEntry::LookupEntry(const std::string& label, double lower, double upper, const std::string& closure)
 		: label(label), lower(lower), upper(upper), closure(closure) {}
 
+	void LookupEntry::init()
+	{
+		label = "";
+		lower = 0.0;
+		upper = 0.0;
+		closure = "";
+	}
+
 	void LookupEntry::execute()  {
 	}
 	void LookupEntry::parse(const std::string& input)

GISLibrary/CoverageCommands.h

@@ -7,8 +7,10 @@ namespace DrawingInstructions
     // NumericAnnotation Class
     class NumericAnnotation : public StateCommand {
     public:
+		NumericAnnotation() = default;
         NumericAnnotation(int decimals, const std::string& championChoice, double buffer);
 
+		void init() override;
         void execute()  override;
         void parse(const std::string& input) override;
 
@@ -21,11 +23,12 @@ namespace DrawingInstructions
     // SymbolAnnotation Class
     class SymbolAnnotation : public StateCommand {
     public:
+		SymbolAnnotation() = default;
         SymbolAnnotation(const std::string& symbolRef, const std::string& rotationAttribute, const std::string& scaleAttribute,
             const std::string& rotationCRS, double rotationOffset, double rotationFactor,
             double scaleFactor);
 
-
+		void init() override;
         void execute()  override;
         void parse(const std::string& input) override;
 
@@ -42,8 +45,10 @@ namespace DrawingInstructions
     // CoverageColor Class
     class CoverageColor : public StateCommand {
     public:
+		CoverageColor() = default;
         CoverageColor(const std::string& startToken, double startTransparency, const std::string& endToken, double endTransparency, double penWidth);
 
+		void init() override;
         void execute()  override;
         void parse(const std::string& input) override;
 
@@ -57,7 +62,10 @@ namespace DrawingInstructions
 
     class LookupEntry : public StateCommand {
     public:
+		LookupEntry() = default;
         LookupEntry(const std::string& label, double lower, double upper, const std::string& closure);
+
+		void init() override;
         void execute()  override;
         void parse(const std::string& input) override;
 

GISLibrary/GF_FeatureType.cpp

@@ -28,51 +28,6 @@ namespace GF
 
 		if (other.spatial)
 			spatial = new SpatialAttributeType(*other.spatial);
-
-		if (other.geometry)
-		{
-			switch (other.geometry->GetType())
-			{				
-			case SGeometryType::Point:
-			{
-				SPoint* pt = (SPoint*)other.geometry;
-				geometry = (pt) ? new SPoint(*pt) : nullptr;
-			}
-			break;
-			case SGeometryType::CompositeCurve:
-			{
-				SCompositeCurve* cc = (SCompositeCurve*)other.geometry;
-				geometry = (cc) ? new SCompositeCurve(*cc) : nullptr;
-			}
-			break;
-			case SGeometryType::Surface:
-			{
-				SSurface* sf = (SSurface*)other.geometry;
-				geometry = (sf) ? new SSurface(*sf) : nullptr;
-			}
-			break;
-			case SGeometryType::MultiPoint:
-			{
-				SMultiPoint* mp = (SMultiPoint*)other.geometry;
-				geometry = (mp) ? new SMultiPoint(*mp) : nullptr;
-			}
-			break;
-			case SGeometryType::Curve:
-			{
-				SCurve* cv = (SCurve*)other.geometry;
-				geometry = (cv) ? new SCurve(*cv) : nullptr;
-			}
-			break;
-			case SGeometryType::Coverage:
-			{
-				SCoverage* cr = (SCoverage*)other.geometry;
-				geometry = (cr) ? new SCoverage(*cr) : nullptr;
-			}
-			break;
-			default:
-				break;
-			}
-		}
 	}
 
 	FeatureType::~FeatureType()

GISLibrary/GF_NamedType.cpp

@@ -8,6 +8,11 @@ namespace GF
 
 	}
 
+	NamedType::NamedType(std::string code)
+	{
+		this->code = code;
+	}
+
 	NamedType::NamedType(const NamedType& other)
 	{
 		code = other.code;

GISLibrary/GF_NamedType.h

@@ -8,6 +8,7 @@ namespace GF
 	{
 	public:
 		NamedType();
+		NamedType(std::string code);
 		NamedType(const NamedType& other);
 		virtual ~NamedType();
 

GISLibrary/GISLibrary.vcxproj

@@ -417,6 +417,7 @@
     <ClCompile Include="R_DDR.cpp" />
     <ClCompile Include="R_VectorRecord.cpp" />
     <ClCompile Include="S100EditRender.cpp" />
+    <ClCompile Include="S100Factory.cpp" />
     <ClCompile Include="S100GML_NameSpace.cpp" />
     <ClCompile Include="S100ExchangeCatalogue.cpp" />
     <ClCompile Include="S100H5.cpp" />
@@ -758,6 +759,7 @@
     <ClInclude Include="R_DDR.h" />
     <ClInclude Include="R_VectorRecord.h" />
     <ClInclude Include="S100EditRender.h" />
+    <ClInclude Include="S100Factory.h" />
     <ClInclude Include="S100GML_NameSpace.h" />
     <ClInclude Include="S100ExchangeCatalogue.h" />
     <ClInclude Include="S100H5.h" />

GISLibrary/GISLibrary.vcxproj.filters

@@ -1059,6 +1059,9 @@
     <ClCompile Include="LuaAttributePathItem.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="S100Factory.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="GISLibrary.h">
@@ -2114,6 +2117,9 @@
     <ClInclude Include="SpatialObjectType.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="S100Factory.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="GISLibrary.rc">