Added Northing and Easting

FAIMS · Aug 8, 2014 · 2f9201d · 2f9201d
1 parent 3108434
commit 2f9201d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/arch16N.properties b/arch16N.properties
@@ -231,3 +231,5 @@ Total_Transect_Width=Total Transect Width
 Participants=Participants
 Number_of_Walkers=Number of Walkers
 Sediment_thickness=Sediment Thickness
+Northing=Northing
+Easting=Easting
diff --git a/data_schema.xml b/data_schema.xml
@@ -14,6 +14,12 @@
     <property name="Longitude" type="float">
       <description/>
     </property>
+    <property name="Northing" type="float">
+      <description/>
+    </property>
+    <property name="Easting" type="float">
+      <description/>
+    </property>
     <property name="Object" type="enum">
       <description/>
       <lookup>

diff --git a/ui_logic.bsh b/ui_logic.bsh
@@ -695,12 +695,17 @@ doNotDelete(){
 }
 
 fillInGPS(String path){
+    Object position = getGPSPosition();    
     Object projPosition = getGPSPositionProjected();
     if (projPosition != null ){
-        Double latitude = projPosition.getLatitude();
-        Double longitude = projPosition.getLongitude();
+        Double latitude = position.getLatitude();
+        Double longitude = position.getLongitude();
+        Double northing = projPosition.getLatitude();
+        Double easting = projPosition.getLongitude();
         setFieldValue(path+"Latitude", latitude);
         setFieldValue(path+"Longitude", longitude);
+        setFieldValue(path+"Northing", northing);
+        setFieldValue(path+"Easting", easting);
     } else {
         showToast("GPS Not initialized");
     }

diff --git a/ui_schema.xml b/ui_schema.xml
@@ -133,6 +133,14 @@
                   <Longitude/>
                 </child2>
               </container1>
+              <container12>
+                <child1>
+                  <Northing/>
+                </child1>
+                <child2>
+                  <Easting/>
+                </child2>
+              </container12>
               <Take_GPS/>
               <container2>
                 <child1>
@@ -630,6 +638,21 @@
             </input>
           </group>
         </group>
+        <group ref="container12" faims_style="orientation">
+          <label></label>
+          <group faims_style="even" ref="child1">
+            <label></label>
+            <input ref="Northing" faims_attribute_name="Northing" faims_attribute_type="measure" faims_certainty="true" faims_annotation="true" faims_read_only="false">
+              <label>{Northing}</label>
+            </input>
+          </group>
+          <group faims_style="even" ref="child2">
+            <label></label>
+            <input ref="Easting" faims_attribute_name="Easting" faims_attribute_type="measure" faims_certainty="true" faims_annotation="true" faims_read_only="false">
+              <label>{Easting}</label>
+            </input>
+          </group>
+        </group>
         <trigger ref="Take_GPS">
           <label>{Take_GPS}</label>
         </trigger>