Natureshadow /
OSMAlchemy
| @@ 203-208 (lines=6) @@ | ||
| 200 | elif op == "||" and bbox[1] >= t[2]: |
|
| 201 | bbox[1] = float(t[2]) |
|
| 202 | elif t[1] == "longitude" and t[0] == "<": |
|
| 203 | if bbox[3] is None: |
|
| 204 | bbox[3] = float(t[2]) |
|
| 205 | elif op == "&&" and bbox[3] >= t[2]: |
|
| 206 | bbox[3] = float(t[2]) |
|
| 207 | elif op == "||" and bbox[3] <= t[2]: |
|
| 208 | bbox[3] = float(t[2]) |
|
| 209 | elif t[1] == "id" and t[0] == "==": |
|
| 210 | idquery = "%s(%i)" % (type_, t[2]) |
|
| 211 | set_name = "s%i" % id(idquery) |
|
| @@ 196-201 (lines=6) @@ | ||
| 193 | elif op == "||" and bbox[2] <= t[2]: |
|
| 194 | bbox[2] = float(t[2]) |
|
| 195 | elif t[1] == "longitude" and t[0] == ">": |
|
| 196 | if bbox[1] is None: |
|
| 197 | bbox[1] = float(t[2]) |
|
| 198 | elif op == "&&" and bbox[1] <= t[2]: |
|
| 199 | bbox[1] = float(t[2]) |
|
| 200 | elif op == "||" and bbox[1] >= t[2]: |
|
| 201 | bbox[1] = float(t[2]) |
|
| 202 | elif t[1] == "longitude" and t[0] == "<": |
|
| 203 | if bbox[3] is None: |
|
| 204 | bbox[3] = float(t[2]) |
|
| @@ 189-194 (lines=6) @@ | ||
| 186 | elif op == "||" and bbox[0] >= t[2]: |
|
| 187 | bbox[0] = float(t[2]) |
|
| 188 | elif t[1] == "latitude" and t[0] == "<": |
|
| 189 | if bbox[2] is None: |
|
| 190 | bbox[2] = float(t[2]) |
|
| 191 | elif op == "&&" and bbox[2] >= t[2]: |
|
| 192 | bbox[2] = float(t[2]) |
|
| 193 | elif op == "||" and bbox[2] <= t[2]: |
|
| 194 | bbox[2] = float(t[2]) |
|
| 195 | elif t[1] == "longitude" and t[0] == ">": |
|
| 196 | if bbox[1] is None: |
|
| 197 | bbox[1] = float(t[2]) |
|
| @@ 182-187 (lines=6) @@ | ||
| 179 | else: |
|
| 180 | # Parse atom |
|
| 181 | if t[1] == "latitude" and t[0] == ">": |
|
| 182 | if bbox[0] is None: |
|
| 183 | bbox[0] = float(t[2]) |
|
| 184 | elif op == "&&" and bbox[0] <= t[2]: |
|
| 185 | bbox[0] = float(t[2]) |
|
| 186 | elif op == "||" and bbox[0] >= t[2]: |
|
| 187 | bbox[0] = float(t[2]) |
|
| 188 | elif t[1] == "latitude" and t[0] == "<": |
|
| 189 | if bbox[2] is None: |
|
| 190 | bbox[2] = float(t[2]) |
|
