comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/LocationDistanceSelect.java @ 8451:e3e5d6bb4902

(issue1733) Use rangeaccess to access range information in location select RangeAccess and RiverUtils sort the locations properly.
author Andre Heinecke <andre.heinecke@intevation.de>
date Tue, 28 Oct 2014 16:10:42 +0100
parents e4606eae8ea5
children 07df414d5d88
comparison
equal deleted inserted replaced
8450:e304f947c5a1 8451:e3e5d6bb4902
16 16
17 import org.dive4elements.artifactdatabase.data.StateData; 17 import org.dive4elements.artifactdatabase.data.StateData;
18 18
19 import org.dive4elements.river.artifacts.D4EArtifact; 19 import org.dive4elements.river.artifacts.D4EArtifact;
20 import org.dive4elements.river.artifacts.WINFOArtifact; 20 import org.dive4elements.river.artifacts.WINFOArtifact;
21
22 import org.dive4elements.river.artifacts.access.RangeAccess;
21 23
22 24
23 /** 25 /**
24 * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> 26 * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a>
25 */ 27 */
132 return minmax; 134 return minmax;
133 } 135 }
134 136
135 137
136 public static double[] getLocations(WINFOArtifact flys) { 138 public static double[] getLocations(WINFOArtifact flys) {
137 StateData data = flys.getData(LOCATIONS); 139 RangeAccess ra = new RangeAccess(flys);
138 String value = data != null ? (String) data.getValue() : null; 140 return ra.getLocations();
139
140 if (value == null || value.length() == 0) {
141 log.warn("No location data given.");
142 return null;
143 }
144
145 String[] splitted = value.split(" ");
146 TDoubleArrayList values = new TDoubleArrayList();
147
148 for (String split: splitted) {
149 try {
150 values.add(Double.valueOf(split));
151 }
152 catch (NumberFormatException nfe) {
153 log.warn(nfe, nfe);
154 }
155 }
156
157 return values.toNativeArray();
158 } 141 }
159 } 142 }
160 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : 143 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :

http://dive4elements.wald.intevation.org