-
Notifications
You must be signed in to change notification settings - Fork 147
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #142 from developmentseed/hotfix/search
version 0.11.0
- Loading branch information
Showing
9 changed files
with
271 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| __version__ = '0.10.0' | ||
| __version__ = '0.11.0' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,3 +7,4 @@ homura>=0.1.2 | |
| boto>=2.38.0 | ||
| polyline==1.1 | ||
| geocoder>=1.5.1 | ||
| jsonschema==2.5.1 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
|
|
||
| geojson_schema = { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "id": "http://json-schema.org/geojson/geojson.json#", | ||
| "title": "Geo JSON object", | ||
| "description": "Schema for a Geo JSON object", | ||
| "type": "object", | ||
| "required": ["type"], | ||
| "properties": { | ||
| "crs": {"$ref": "http://json-schema.org/geojson/crs.json#"}, | ||
| "bbox": {"$ref": "http://json-schema.org/geojson/bbox.json#"} | ||
| }, | ||
| "oneOf": [ | ||
| {"$ref": "#/definitions/geometry"}, | ||
| {"$ref": "#/definitions/geometryCollection"}, | ||
| {"$ref": "#/definitions/feature"}, | ||
| {"$ref": "#/definitions/featureCollection"} | ||
| ], | ||
| "definitions": { | ||
| "position": { | ||
| "description": "A single position", | ||
| "type": "array", | ||
| "minItems": 2, | ||
| "items": [ {"type": "number"}, {"type": "number"} ], | ||
| "additionalItems": False | ||
| }, | ||
| "positionArray": { | ||
| "description": "An array of positions", | ||
| "type": "array", | ||
| "items": {"$ref": "#/definitions/position"} | ||
| }, | ||
| "lineString": { | ||
| "description": "An array of two or more positions", | ||
| "allOf": [ | ||
| {"$ref": "#/definitions/positionArray"}, | ||
| {"minItems": 2} | ||
| ] | ||
| }, | ||
| "linearRing": { | ||
| "description": "An array of four positions where the first equals the last", | ||
| "allOf": [ | ||
| {"$ref": "#/definitions/positionArray"}, | ||
| {"minItems": 4} | ||
| ] | ||
| }, | ||
| "polygon": { | ||
| "description": "An array of linear rings", | ||
| "type": "array", | ||
| "items": {"$ref": "#/definitions/linearRing"} | ||
| }, | ||
| "geometry": { | ||
| "$schema": "http://json-schema.org/draft-04/schema#", | ||
| "title": "geometry", | ||
| "description": "One geometry as defined by GeoJSON", | ||
| "type": "object", | ||
| "required": ["type", "coordinates"], | ||
| "oneOf": [ | ||
| { | ||
| "title": "Point", | ||
| "properties": { | ||
| "type": {"enum": ["Point"]}, | ||
| "coordinates": {"$ref": "#/definitions/position"} | ||
| } | ||
| }, | ||
| { | ||
| "title": "MultiPoint", | ||
| "properties": { | ||
| "type": {"enum": ["MultiPoint"]}, | ||
| "coordinates": {"$ref": "#/definitions/positionArray"} | ||
| } | ||
| }, | ||
| { | ||
| "title": "LineString", | ||
| "properties": { | ||
| "type": {"enum": ["LineString"]}, | ||
| "coordinates": {"$ref": "#/definitions/lineString"} | ||
| } | ||
| }, | ||
| { | ||
| "title": "MultiLineString", | ||
| "properties": { | ||
| "type": {"enum": [ "MultiLineString" ]}, | ||
| "coordinates": { | ||
| "type": "array", | ||
| "items": {"$ref": "#/definitions/lineString"} | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| "title": "Polygon", | ||
| "properties": { | ||
| "type": {"enum": [ "Polygon" ]}, | ||
| "coordinates": {"$ref": "#/definitions/polygon"} | ||
| } | ||
| }, | ||
| { | ||
| "title": "MultiPolygon", | ||
| "properties": { | ||
| "type": {"enum": ["MultiPolygon"]}, | ||
| "coordinates": { | ||
| "type": "array", | ||
| "items": {"$ref": "#/definitions/polygon"} | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| "geometryCollection": { | ||
| "title": "GeometryCollection", | ||
| "description": "A collection of geometry objects", | ||
| "required": [ "geometries" ], | ||
| "properties": { | ||
| "type": {"enum": [ "GeometryCollection" ]}, | ||
| "geometries": { | ||
| "type": "array", | ||
| "items": {"$ref": "#/definitions/geometry"} | ||
| } | ||
| } | ||
| }, | ||
| "feature": { | ||
| "title": "Feature", | ||
| "description": "A Geo JSON feature object", | ||
| "required": [ "geometry", "properties" ], | ||
| "properties": { | ||
| "type": {"enum": [ "Feature" ]}, | ||
| "geometry": { | ||
| "oneOf": [ | ||
| {"type": "null"}, | ||
| {"$ref": "#/definitions/geometry"} | ||
| ] | ||
| }, | ||
| "properties": {"type": [ "object", "null" ]}, | ||
| "id": {"FIXME": "may be there, type not known (string? number?)"} | ||
| } | ||
| }, | ||
| "featureCollection": { | ||
| "title": "FeatureCollection", | ||
| "description": "A Geo JSON feature collection", | ||
| "required": [ "features" ], | ||
| "properties": { | ||
| "type": {"enum": [ "FeatureCollection" ]}, | ||
| "features": { | ||
| "type": "array", | ||
| "items": {"$ref": "#/definitions/feature"} | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.