Update interface openinghours

This commit is contained in:
sanderd17 2012-08-08 14:37:19 +03:00
parent 344344150f
commit 1864074f1b

View file

@ -191,7 +191,7 @@ public class AHSupermarketResolver {
newTags.put("addr:postcode", props.get("zip")+""); newTags.put("addr:postcode", props.get("zip")+"");
JSONArray o = (JSONArray) props.get("hours"); JSONArray o = (JSONArray) props.get("hours");
List<OpeningHoursParser.OpeningHoursRule> rules = new ArrayList<OpeningHoursRule>(); OpeningHoursParser.OpeningHours rules = new OpeningHoursParser.OpeningHours();
BasicDayOpeningHourRule prev = null; BasicDayOpeningHourRule prev = null;
for(int i=0; i<7; i++){ for(int i=0; i<7; i++){
JSONObject obj = o.getJSONObject(i); JSONObject obj = o.getJSONObject(i);
@ -207,14 +207,14 @@ public class AHSupermarketResolver {
} else { } else {
BasicDayOpeningHourRule rule = new OpeningHoursParser.BasicDayOpeningHourRule(); BasicDayOpeningHourRule rule = new OpeningHoursParser.BasicDayOpeningHourRule();
rule.getDays()[i] = true; rule.getDays()[i] = true;
rule.setStartEndTime(start, end); rule.addTimeRange(start, end);
prev = rule; prev = rule;
rules.add(rule); rules.addRule(rule);
} }
} }
} }
newTags.put("opening_hours", OpeningHoursParser.toStringOpenedHours(rules)); newTags.put("opening_hours", rules.toString());
// Check distance to info // Check distance to info
LatLon real = new LatLon((Double)props.get("lat"), (Double) props.get("lng")); LatLon real = new LatLon((Double)props.get("lat"), (Double) props.get("lng"));