#117 #148 Instantiate constraints in the 2 places that seem to make s…

…ense.
posm · May 14, 2016 · 6ecab23 · 6ecab23
1 parent fda469b
commit 6ecab23
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/src/main/java/org/redcross/openmapkit/TagListAdapter.java b/app/src/main/java/org/redcross/openmapkit/TagListAdapter.java
@@ -32,6 +32,7 @@ public TagListAdapter(Activity activity, OSMElement osmElement) {
         tagMap = new LinkedHashMap<>();
 
         if (ODKCollectHandler.isODKCollectMode()) {
+            Constraints constraints = new Constraints(osmElement);
             Map<String,String> tags = osmElement.getTags();
             Map<String, String> readOnlyTags = new LinkedHashMap<>(tags);
             ODKCollectData odkCollectData = ODKCollectHandler.getODKCollectData();

diff --git a/app/src/main/java/org/redcross/openmapkit/tagswipe/TagEdit.java b/app/src/main/java/org/redcross/openmapkit/tagswipe/TagEdit.java
@@ -9,6 +9,7 @@
 
 import com.spatialdev.osm.model.OSMElement;
 
+import org.redcross.openmapkit.Constraints;
 import org.redcross.openmapkit.odkcollect.ODKCollectData;
 import org.redcross.openmapkit.odkcollect.ODKCollectHandler;
 import org.redcross.openmapkit.odkcollect.tag.ODKTag;
@@ -33,6 +34,7 @@ public class TagEdit {
     private static LinkedHashMap<String, TagEdit> tagEditHash;
     private static List<TagEdit> tagEdits;
     private static OSMElement osmElement;
+    private static Constraints constraints;
 
     private String tagKey;
     private String tagVal;
@@ -48,12 +50,19 @@ public class TagEdit {
      */
     private CheckBox editTextCheckBox;
     private EditText checkBoxEditText;
-
+
+    /**
+     * Factory Method that gives collection of instances.
+     *
+     * @return
+     */
     public static List<TagEdit> buildTagEdits() {
-        int idx = 0;
         tagEditHash = new LinkedHashMap<>();
         tagEdits = new ArrayList<>();
         osmElement = OSMElement.getSelectedElements().getFirst();
+        constraints = new Constraints(osmElement);
+
+        int idx = 0;
         Map<String, String> tags = osmElement.getTags();
 
         // Tag Edits for ODK Collect Mode