From 5d451be151b27e9a2632b07f08ff68bc76c57f42 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 7 Jun 2009 20:28:26 +0100
Subject: [PATCH] Saving points to XML

---
 schemas/map.xsd | 13 +++++++++++--
 src/Map.cpp     | 19 +++++++++++++++++++
 src/Points.cpp  | 26 +++++++++++++++++---------
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/schemas/map.xsd b/schemas/map.xsd
index 17490af..eeb403d 100644
--- a/schemas/map.xsd
+++ b/schemas/map.xsd
@@ -9,8 +9,8 @@
           <xs:complexType>
             <xs:attribute name="x" type="xs:nonNegativeInteger" use="required"/>
             <xs:attribute name="y" type="xs:nonNegativeInteger" use="required"/>
-            <xs:attribute name="dirX" type="xs:nonNegativeInteger" use="required"/>
-            <xs:attribute name="dirY" type="xs:nonNegativeInteger" use="required"/>
+            <xs:attribute name="dirX" type="xs:integer" use="required"/>
+            <xs:attribute name="dirY" type="xs:integer" use="required"/>
           </xs:complexType>
         </xs:element>
 
@@ -42,6 +42,15 @@
                       </xs:complexType>
                     </xs:element>
 
+                    <xs:element name="points" minOccurs="0">
+                      <xs:complexType>
+                        <xs:attribute name="align" use="required"
+                                      type="xs:string"/>
+                        <xs:attribute name="reflect" use="required"
+                                      type="xs:string"/>
+                      </xs:complexType>
+                    </xs:element>
+
                     <xs:element name="curvedTrack" minOccurs="0">
                       <xs:complexType>
                         <xs:attribute name="startAngle" use="required"
diff --git a/src/Map.cpp b/src/Map.cpp
index 22b6065..ee4c14c 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -1197,6 +1197,8 @@ public:
          handleCurvedTrack(attrs);
       else if (localName == "crossoverTrack")
          handleCrossoverTrack(attrs);
+      else if (localName == "points")
+         handlePoints(attrs);
       else if (localName == "stationPart")
          handleStationPart(attrs);
       else if (localName == "station")
@@ -1285,6 +1287,23 @@ private:
                         makeStraightTrack(axis));
    }
 
+   void handlePoints(const AttributeSet& attrs)
+   {
+      string align;
+      attrs.get("align", align);
+
+      bool reflect;
+      attrs.get("reflect", reflect);
+
+      track::Direction dir =
+         align == "x" ? axis::X
+         : (align == "-x" ? -axis::X
+            : (align == "y" ? axis::Y : -axis::Y));
+
+      myMap->setTrackAt(makePoint(myXPtr, myYPtr),
+                        makePoints(dir, reflect));
+   }
+   
    void handleCurvedTrack(const AttributeSet& attrs)
    {
       int startAngle, finishAngle, radius;
diff --git a/src/Points.cpp b/src/Points.cpp
index 89c3b60..2611c84 100644
--- a/src/Points.cpp
+++ b/src/Points.cpp
@@ -96,21 +96,23 @@ void Points::render() const
 
 double Points::segmentLength() const
 {
-   return 2.0;
+   return 3.0;
 }
 
 void Points::transform(const track::Direction& aDirection,
                        double aDelta) const
 {
-   assert(aDelta < 2.0);
+   assert(aDelta < 3.0);
 
    if (aDirection == -myAxis)
-      aDelta = 2.0 - aDelta;
+      aDelta = 3.0 - aDelta;
 
    const double xTrans =
-      myAxis == axis::X || myAxis == -axis::X ? aDelta : 0.0;
+      myAxis == axis::X ? 3.0 - aDelta
+      : (myAxis == -axis::X ? aDelta : 0.0);
    const double yTrans =
-      myAxis == axis::Y || myAxis == -axis::Y ? aDelta : 0.0;
+      myAxis == axis::Y ? 3.0 - aDelta
+      : (myAxis == -axis::Y ? aDelta : 0.0);
 
    glTranslatef(static_cast<double>(myX) - xTrans,
                 0.0,
@@ -158,13 +160,13 @@ track::Connection Points::nextPosition(const track::Direction& aDirection) const
    ensureValidDirection(aDirection);
    
    if (aDirection == axis::X)
-      return make_pair(makePoint(myX + 3, myY), axis::X);
+      return make_pair(makePoint(myX + 1, myY), axis::X);
    else if (aDirection == -axis::X)
       return make_pair(makePoint(myX - 3, myY), -axis::X);
    else if (aDirection == axis::Y)
       return make_pair(makePoint(myX, myY + 3), axis::Y);
    else if (aDirection == -axis::Y)
-      return make_pair(makePoint(myX, myY - 3), -axis::Y);
+      return make_pair(makePoint(myX, myY - 1), -axis::Y);
    else
       assert(false);
 }
@@ -201,8 +203,14 @@ ITrackSegmentPtr Points::mergeExit(const Point<int>& aPoint,
 }
 
 xml::element Points::toXml() const
-{
-
+{ 
+   return xml::element("points")
+      .addAttribute("align",
+                    myAxis == axis::X ? "x"
+                    : (myAxis == -axis::X ? "-x"
+                       : (myAxis == axis::Y ? "y"
+                          : (myAxis == -axis::Y ? "-y" : "?"))))
+      .addAttribute("reflect", amReflected);
 }
 
 ITrackSegmentPtr makePoints(track::Direction aDirection, bool reflect)
-- 
2.39.2