diff --git a/Dockerfile b/Dockerfile
index ba941ee3..fda413fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
##############################################################################
# This is a multi-stage Dockerfile with three targets:
# * libreg_local_db
-# * webapp_dev
-# * webapp_prod
+# * libreg_local
+# * libreg_active
#
# For background on multi-stage builds, see:
#
@@ -165,12 +165,12 @@ ENTRYPOINT ["/bin/sh", "-c", "/docker-entrypoint.sh"]
##############################################################################
-# Build target: libreg_dev
+# Build target: libreg_local
#
# Note that this target assumes a host mount is in place to link the current
# directory into the container at /simplye_app. The production target copies in
# the entire project directory since it will remain static.
-FROM builder AS libreg_dev
+FROM builder AS libreg_local
ENV FLASK_ENV development
ENV SIMPLYE_RUN_WEBPACK_WATCH 1
@@ -181,9 +181,9 @@ RUN apk add --no-cache npm
##############################################################################
-# Build target: libreg_prod
+# Build target: libreg_active
#
-FROM builder AS libreg_prod
+FROM builder AS libreg_active
ENV FLASK_ENV production
diff --git a/Makefile b/Makefile
index 3fb84613..99746d67 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: help build db-session webapp-shell up up-watch start stop down test clean full-clean build-prod up-prod up-prod-watch test-prod down-prod
+.PHONY: help build db-session webapp-shell up up-watch start stop down test clean full-clean build-active up-active up-active-watch test-active down-active
.DEFAULT_GOAL := help
help:
@@ -6,22 +6,27 @@ help:
@echo ""
@echo "Commands:"
@echo ""
- @echo " build - Build the libreg_webapp and libreg_local_db images"
- @echo " db-session - Start a psql session as the superuser on the db container"
- @echo " webapp-shell - Open a shell on the webapp container"
- @echo " up - Bring up the local cluster in detached mode"
- @echo " up-watch - Bring up the local cluster, remains attached"
- @echo " start - Start a stopped cluster"
- @echo " stop - Stop the cluster without removing containers"
- @echo " down - Take down the local cluster"
- @echo " test - Run the python test suite on the webapp container"
- @echo " clean - Take down the local cluster and removes the db volume"
- @echo " full-clean - Take down the local cluster and remove containers, volumes, and images"
- @echo " build-prod - Build images based on the docker-compose-cicd.yml file"
- @echo " up-prod - Bring up the cluster from the docker-compose-cicd.yml file"
- @echo " up-prod-watch - Bring up the cluster from the cicd file, stay attached"
- @echo " test-prod - Run the test suite on the prod container"
- @echo " down-prod - Stop the cluster from the cicd file"
+ @echo " Related to Local Development:"
+ @echo ""
+ @echo " build - Build the libreg_webapp and libreg_local_db images"
+ @echo " db-session - Start a psql session as the superuser on the db container"
+ @echo " webapp-shell - Open a shell on the webapp container"
+ @echo " up - Bring up the local cluster in detached mode"
+ @echo " up-watch - Bring up the local cluster, remains attached"
+ @echo " start - Start a stopped cluster"
+ @echo " stop - Stop the cluster without removing containers"
+ @echo " down - Take down the local cluster"
+ @echo " test - Run the python test suite on the webapp container"
+ @echo " clean - Take down the local cluster and removes the db volume"
+ @echo " full-clean - Take down the local cluster and remove containers, volumes, and images"
+ @echo ""
+ @echo " Related to Deployment:"
+ @echo ""
+ @echo " build-active - Build images based on the docker-compose-cicd.yml file"
+ @echo " up-active - Bring up the cluster from the docker-compose-cicd.yml file"
+ @echo " up-active-watch - Bring up the cluster from the cicd file, stay attached"
+ @echo " test-active - Run the test suite on the local libreg_active_webapp container"
+ @echo " down-active - Stop the cluster from the cicd file"
build:
docker-compose build
@@ -56,17 +61,17 @@ clean:
full-clean:
docker-compose down --volumes --rmi all
-build-prod:
+build-active:
docker-compose -f docker-compose-cicd.yml build
-up-prod:
+up-active:
docker-compose -f docker-compose-cicd.yml up -d
-up-prod-watch:
+up-active-watch:
docker-compose -f docker-compose-cicd.yml up
-test-prod:
- docker exec -it libreg_prod_webapp pipenv run pytest tests
+test-active:
+ docker exec -it libreg_active_webapp pipenv run pytest tests
-down-prod:
+down-active:
docker-compose -f docker-compose-cicd.yml down
diff --git a/adobe_vendor_id.py b/adobe_vendor_id.py
index 97bb4a70..3a5ac3ad 100644
--- a/adobe_vendor_id.py
+++ b/adobe_vendor_id.py
@@ -1,33 +1,29 @@
-import datetime
-import flask
-from flask import Response
-
-import base64
import re
-import requests
-from model import (
- ShortClientTokenDecoder,
-)
+import requests
+from flask import Response, request
+import adobe_xml_templates as t
+from model import ShortClientTokenDecoder
from util.string_helpers import base64
from util.xmlparser import XMLParser
-class AdobeVendorIDController(object):
-
- """Flask controllers that implement the Account Service and
- Authorization Service portions of the Adobe Vendor ID protocol.
+class AdobeVendorIDController:
"""
- def __init__(self, _db, vendor_id, node_value,
- delegates=[]):
+ Flask controllers that implement the Account Service and Authorization Service
+ portions of the Adobe Vendor ID protocol.
+ """
+ def __init__(self, _db, vendor_id, node_value, delegates=None):
"""Constructor.
- :param delegates: A list of URLs or AdobeVendorIDClient
- objects. If this Vendor ID server cannot validate an incoming
- login, it will delegate to each of these other servers in
- turn.
+ :param delegates: A list of URLs or AdobeVendorIDClient objects. If this Vendor ID
+ server cannot validate an incoming login, it will delegate to each
+ of these other servers in turn.
"""
+ if not delegates:
+ delegates = []
+
self._db = _db
self.request_handler = AdobeVendorIDRequestHandler(vendor_id)
self.model = AdobeVendorIDModel(self._db, node_value, delegates)
@@ -36,15 +32,20 @@ def signin_handler(self):
"""Process an incoming signInRequest document."""
__transaction = self._db.begin_nested()
output = self.request_handler.handle_signin_request(
- flask.request.data, self.model.standard_lookup,
- self.model.authdata_lookup)
+ request.data.decode('utf8'),
+ self.model.standard_lookup,
+ self.model.authdata_lookup
+ )
__transaction.commit()
+
return Response(output, 200, {"Content-Type": "application/xml"})
def userinfo_handler(self):
"""Process an incoming userInfoRequest document."""
output = self.request_handler.handle_accountinfo_request(
- flask.request.data, self.model.urn_to_label)
+ request.data.decode('utf8'),
+ self.model.urn_to_label
+ )
return Response(output, 200, {"Content-Type": "application/xml"})
def status_handler(self):
@@ -53,32 +54,31 @@ def status_handler(self):
class AdobeRequestParser(XMLParser):
- NAMESPACES = { "adept" : "http://ns.adobe.com/adept" }
+ NAMESPACES = {"adept": "http://ns.adobe.com/adept"}
def process(self, data):
- requests = list(self.process_all(
- data, self.REQUEST_XPATH, self.NAMESPACES))
+ requests = list(self.process_all(data, self.REQUEST_XPATH, self.NAMESPACES))
+
if not requests:
return None
- # There should only be one request tag, but if there's more than
- # one, only return the first one.
- return requests[0]
+
+ return requests[0] # Return only the first request tag, even if there are multiple
def _add(self, d, tag, key, namespaces, transform=None):
v = self._xpath1(tag, 'adept:' + key, namespaces)
+
if v is not None:
v = v.text
if v is not None:
v = v.strip()
- if transform is not None:
+ if callable(transform):
v = transform(v)
+
d[key] = v
class AdobeSignInRequestParser(AdobeRequestParser):
-
REQUEST_XPATH = "/adept:signInRequest"
-
STANDARD = 'standard'
AUTH_DATA = 'authData'
@@ -87,19 +87,21 @@ def process_one(self, tag, namespaces):
if not method:
raise ValueError("No signin method specified")
+
data = dict(method=method)
+
if method == self.STANDARD:
self._add(data, tag, 'username', namespaces)
self._add(data, tag, 'password', namespaces)
elif method == self.AUTH_DATA:
self._add(data, tag, self.AUTH_DATA, namespaces, base64.b64decode)
else:
- raise ValueError("Unknown signin method: %s" % method)
+ raise ValueError(f"Unknown signin method: {method}")
+
return data
class AdobeAccountInfoRequestParser(AdobeRequestParser):
-
REQUEST_XPATH = "/adept:accountInfoRequest"
def process_one(self, tag, namespaces):
@@ -109,149 +111,139 @@ def process_one(self, tag, namespaces):
return data
-class AdobeVendorIDRequestHandler(object):
-
- """Standalone class that can be tested without bringing in Flask or
- the database schema.
- """
-
- SIGN_IN_RESPONSE_TEMPLATE = """
-%(user)s
-
-"""
-
- ACCOUNT_INFO_RESPONSE_TEMPLATE = """
-
-"""
-
- AUTH_ERROR_TYPE = "AUTH"
- ACCOUNT_INFO_ERROR_TYPE = "ACCOUNT_INFO"
+class AdobeVendorIDRequestHandler:
+ """Standalone class that can be tested without bringing in Flask or the database schema"""
- ERROR_RESPONSE_TEMPLATE = ''
+ ##### Class Constants #################################################### # noqa: E266
+ AUTH_ERROR_TYPE = "AUTH" # noqa: E221
+ ACCOUNT_INFO_ERROR_TYPE = "ACCOUNT_INFO" # noqa: E221
+ TOKEN_FAILURE = 'Incorrect token.' # noqa: E221
+ AUTHENTICATION_FAILURE = 'Incorrect barcode or PIN.' # noqa: E221
+ URN_LOOKUP_FAILURE = "Could not identify patron from '%s'." # noqa: E221
- TOKEN_FAILURE = 'Incorrect token.'
- AUTHENTICATION_FAILURE = 'Incorrect barcode or PIN.'
- URN_LOOKUP_FAILURE = "Could not identify patron from '%s'."
+ SIGN_IN_RESPONSE_TEMPLATE = t.SIGN_IN_RESPONSE_TEMPLATE # noqa: E221
+ ACCOUNT_INFO_RESPONSE_TEMPLATE = t.ACCOUNT_INFO_RESPONSE_TEMPLATE # noqa: E221
+ ERROR_RESPONSE_TEMPLATE = t.ERROR_RESPONSE_TEMPLATE # noqa: E221
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
def __init__(self, vendor_id):
self.vendor_id = vendor_id
def handle_signin_request(self, data, standard_lookup, authdata_lookup):
parser = AdobeSignInRequestParser()
+
try:
data = parser.process(data)
except Exception as e:
return self.error_document(self.AUTH_ERROR_TYPE, str(e))
+
user_id = label = None
+
if not data:
- return self.error_document(
- self.AUTH_ERROR_TYPE, "Request document in wrong format.")
- if not 'method' in data:
- return self.error_document(
- self.AUTH_ERROR_TYPE, "No method specified")
+ return self.error_document(self.AUTH_ERROR_TYPE, "Request document in wrong format.")
+
+ if 'method' not in data:
+ return self.error_document(self.AUTH_ERROR_TYPE, "No method specified")
+
if data['method'] == parser.STANDARD:
- user_id, label = standard_lookup(data)
+ (user_id, label) = standard_lookup(data)
failure = self.AUTHENTICATION_FAILURE
elif data['method'] == parser.AUTH_DATA:
authdata = data[parser.AUTH_DATA]
- user_id, label = authdata_lookup(authdata)
+ (user_id, label) = authdata_lookup(authdata)
failure = self.TOKEN_FAILURE
+
if user_id is None:
return self.error_document(self.AUTH_ERROR_TYPE, failure)
else:
- return self.SIGN_IN_RESPONSE_TEMPLATE % dict(
- user=user_id, label=label)
+ return self.SIGN_IN_RESPONSE_TEMPLATE % {"user": user_id, "label": label}
def handle_accountinfo_request(self, data, urn_to_label):
parser = AdobeAccountInfoRequestParser()
label = None
+
try:
data = parser.process(data)
if not data:
- return self.error_document(
- self.ACCOUNT_INFO_ERROR_TYPE,
- "Request document in wrong format.")
- if not 'user' in data:
- return self.error_document(
- self.ACCOUNT_INFO_ERROR_TYPE,
- "Could not find user identifer in request document.")
+ return self.error_document(self.ACCOUNT_INFO_ERROR_TYPE, "Request document in wrong format.")
+
+ if 'user' not in data:
+ return self.error_document(self.ACCOUNT_INFO_ERROR_TYPE,
+ "Could not find user identifer in request document.")
+
label = urn_to_label(data['user'])
except Exception as e:
- return self.error_document(
- self.ACCOUNT_INFO_ERROR_TYPE, str(e))
+ return self.error_document(self.ACCOUNT_INFO_ERROR_TYPE, str(e))
if label:
return self.ACCOUNT_INFO_RESPONSE_TEMPLATE % dict(label=label)
else:
- return self.error_document(
- self.ACCOUNT_INFO_ERROR_TYPE,
- self.URN_LOOKUP_FAILURE % data['user']
- )
+ return self.error_document(self.ACCOUNT_INFO_ERROR_TYPE, self.URN_LOOKUP_FAILURE % data['user'])
def error_document(self, type, message):
- return self.ERROR_RESPONSE_TEMPLATE % dict(
- vendor_id=self.vendor_id, type=type, message=message)
+ return self.ERROR_RESPONSE_TEMPLATE % {"vendor_id": self.vendor_id, "type": type, "message": message}
-class AdobeVendorIDModel(object):
+ ##### Private Methods #################################################### # noqa: E266
- """Implement Adobe Vendor ID within the library registry's database
- model.
- """
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+
+ ##### Class Methods ###################################################### # noqa: E266
+
+ ##### Private Class Methods ############################################## # noqa: E266
+
+
+class AdobeVendorIDModel:
+ """Implement Adobe Vendor ID within the library registry's database model"""
def __init__(self, _db, node_value, delegates):
self._db = _db
-
delegate_objs = []
+
for i in delegates:
if isinstance(i, str):
delegate_objs.append(AdobeVendorIDClient(i))
else:
delegate_objs.append(i)
- self.short_client_token_decoder = ShortClientTokenDecoder(
- node_value, delegate_objs
- )
+
+ self.short_client_token_decoder = ShortClientTokenDecoder(node_value, delegate_objs)
def standard_lookup(self, authorization_data):
- """Treat an incoming username and password as the two parts of a short
- client token. Return an Adobe Account ID and a human-readable
- label. Create a DelegatedPatronIdentifier to hold the Adobe
- Account ID if necessary.
+ """
+ Treat an incoming username and password as the two parts of a short client token.
+ Return an Adobe Account ID and a human-readable label. Create a DelegatedPatronIdentifier
+ to hold the Adobe Account ID if necessary.
"""
username = authorization_data.get('username')
password = authorization_data.get('password')
+
try:
delegated_patron_identifier = self.short_client_token_decoder.decode_two_part(
self._db, username, password
)
- except ValueError as e:
+ except ValueError:
delegated_patron_identifier = None
+
if delegated_patron_identifier:
return self.account_id_and_label(delegated_patron_identifier)
else:
for delegate in self.short_client_token_decoder.delegates:
try:
- account_id, label, content = delegate.sign_in_standard(
- username, password
- )
+ (account_id, label, _) = delegate.sign_in_standard(username, password)
return account_id, label
- except Exception as e:
- # This delegate couldn't help us.
- pass
+ except Exception:
+ pass # This delegate couldn't help us.
- # Neither this server nor the delegates were able to do anything.
- return None, None
+ return (None, None) # Neither this server nor the delegates were able to do anything.
def authdata_lookup(self, authdata):
- """Treat an authdata string as a short client token. Return an Adobe
- Account ID and a human-readable label. Create a
- DelegatedPatronIdentifier to hold the Adobe Account ID if
- necessary.
+ """
+ Treat an authdata string as a short client token. Return an Adobe Account ID and a
+ human-readable label. Create a DelegatedPatronIdentifier to hold the Adobe Account ID
+ if necessary.
"""
try:
- delegated_patron_identifier = self.short_client_token_decoder.decode(
- self._db, authdata
- )
- except ValueError as e:
+ delegated_patron_identifier = self.short_client_token_decoder.decode(self._db, authdata)
+ except ValueError:
delegated_patron_identifier = None
if delegated_patron_identifier:
@@ -259,28 +251,24 @@ def authdata_lookup(self, authdata):
else:
for delegate in self.short_client_token_decoder.delegates:
try:
- account_id, label, content = delegate.sign_in_authdata(
- authdata
- )
+ (account_id, label, _) = delegate.sign_in_authdata(authdata)
return account_id, label
- except Exception as e:
- # This delegate couldn't help us.
- pass
+ except Exception:
+ pass # This delegate couldn't help us.
- # Neither this server nor the delegates were able to do anything.
- # We couldn't find anything.
- return None, None
+ return (None, None) # Neither this server nor the delegates were able to do anything.
def account_id_and_label(self, delegated_patron_identifier):
- "Turn a DelegatedPatronIdentifier into a (account id, label) 2-tuple."
+ """Turn a DelegatedPatronIdentifier into a 2-tuple of (account id, label)"""
if not delegated_patron_identifier:
return (None, None)
+
urn = delegated_patron_identifier.delegated_identifier
return (urn, self.urn_to_label(urn))
def urn_to_label(self, urn):
"""We have no information about patrons, so labels are sparse."""
- return "Delegated account ID %s" % urn
+ return f"Delegated account ID {urn}"
class VendorIDAuthenticationError(Exception):
@@ -291,17 +279,15 @@ class VendorIDServerException(Exception):
"""The Vendor ID service is not working properly."""
-class AdobeVendorIDClient(object):
- """A client library for the Adobe Vendor ID protocol.
+class AdobeVendorIDClient:
+ """
+ A client library for the Adobe Vendor ID protocol.
- This is used by the AdobeVendorIDAcceptanceTestScript to verify
- the compliance of the library registry.
+ Used by the AdobeVendorIDAcceptanceTestScript to verify the compliance of the library registry.
- It may also be used during a transition period where you are
- moving from another Vendor ID implementation to a library
- registry. You can delegate to another Vendor ID implementation the
- validation of any credentials that cannot be validated through the
- library registry.
+ It may also be used during a transition period where you are moving from another Vendor ID
+ implementation to a library registry. You can delegate to another Vendor ID implementation the
+ validation of any credentials that cannot be validated through the library registry.
"""
SIGNIN_AUTHDATA_BODY = """
@@ -370,10 +356,10 @@ def extract_label(self, content):
def handle_error(self, status_code, content):
if status_code != 200:
- raise VendorIDServerException(
- "Unexpected status code: %s" % status_code
- )
+ raise VendorIDServerException(f"Unexpected status code: {status_code}")
+
error = self._extract_by_re(content, self.ERROR_RE)
+
if error:
raise VendorIDAuthenticationError(error)
@@ -388,34 +374,8 @@ def _process_sign_in_result(self, response):
self.handle_error(response.status_code, content)
identifier = self.extract_user_identifier(content)
label = self.extract_label(content)
+
if not identifier or not label:
raise VendorIDServerException("Unexpected response: %s" % content)
- return identifier, label, content
-
-class MockAdobeVendorIDClient(AdobeVendorIDClient):
- """Mock AdobeVendorIDClient for use in tests."""
-
- def __init__(self):
- self.queue = []
-
- def enqueue(self, response):
- """Queue a response."""
- self.queue.insert(0, response)
-
- def dequeue(self, *args, **kwargs):
- """Dequeue a response.
-
- If it's an exception, raise it. Otherwise return it.
- """
- if not self.queue:
- raise VendorIDServerException("No response queued.")
- response = self.queue.pop()
- if isinstance(response, Exception):
- raise response
- return response
-
- status = dequeue
- sign_in_authdata = dequeue
- sign_in_standard = dequeue
- user_info = dequeue
+ return identifier, label, content
diff --git a/adobe_xml_templates.py b/adobe_xml_templates.py
new file mode 100644
index 00000000..ce6198a0
--- /dev/null
+++ b/adobe_xml_templates.py
@@ -0,0 +1,23 @@
+ACCOUNT_INFO_REQUEST_TEMPLATE = """
+%(uuid)s
+"""
+
+ACCOUNT_INFO_RESPONSE_TEMPLATE = """
+
+"""
+
+ERROR_RESPONSE_TEMPLATE = ''
+
+AUTHDATA_SIGN_IN_REQUEST_TEMPLATE = """
+%(authdata)s
+"""
+
+SIGN_IN_REQUEST_TEMPLATE = """
+ %(username)s
+ %(password)s
+"""
+
+SIGN_IN_RESPONSE_TEMPLATE = """
+ %(user)s
+
+"""
diff --git a/app.py b/app.py
index 7b022bef..c10824bc 100644
--- a/app.py
+++ b/app.py
@@ -3,7 +3,7 @@
import sys
import urllib.parse
-from flask import Flask, url_for, redirect, Response, request
+from flask import Flask, Response
from flask_babel import Babel
from flask_sqlalchemy_session import flask_scoped_session
@@ -13,226 +13,217 @@
from model import SessionManager, ConfigurationSetting
from util.app_server import returns_problem_detail, returns_json_or_response_or_problem_detail
-from app_helpers import (
- compressible,
- has_library_factory,
- uses_location_factory,
-)
+from decorators import (compressible, has_library, uses_location)
+testing = 'TESTING' in os.environ
+babel = Babel()
-app = Flask(__name__)
-babel = Babel(app)
+db_url = Configuration.database_url(test=testing)
+test_db_url = Configuration.database_url(test=True)
-# Create annotators for this app.
-has_library = has_library_factory(app)
-uses_location = uses_location_factory(app)
-testing = 'TESTING' in os.environ
-db_url = Configuration.database_url(testing)
-SessionManager.initialize(db_url)
-session_factory = SessionManager.sessionmaker(db_url)
-_db = flask_scoped_session(session_factory, app)
-
-log_level = LogConfiguration.initialize(_db, testing=testing)
-debug = log_level == 'DEBUG'
-app.config['DEBUG'] = debug
-app.debug = debug
-app._db = _db
-
-if os.environ.get('AUTOINITIALIZE') == 'False':
- pass
- # It's the responsibility of the importing code to set app.library_registry
- # appropriately.
-else:
- if getattr(app, 'library_registry', None) is None:
+def create_app(testing=False):
+ app = Flask(__name__)
+ babel.init_app(app)
+
+ SessionManager.initialize(db_url)
+ session_factory = SessionManager.sessionmaker(db_url)
+ _db = flask_scoped_session(session_factory, app)
+
+ log_level = LogConfiguration.initialize(_db, testing=testing)
+ debug = log_level == 'DEBUG'
+ app.config['DEBUG'] = debug
+ app.debug = debug
+ app._db = _db
+
+ if not getattr(app, 'library_registry', None):
app.library_registry = LibraryRegistry(_db)
-@app.before_first_request
-def set_secret_key(_db=None):
- _db = _db or app._db
- app.secret_key = ConfigurationSetting.sitewide_secret(_db, Configuration.SECRET_KEY)
-
-@app.teardown_request
-def shutdown_session(exception):
- """Commit or rollback the database session associated with
- the request.
- """
- if (hasattr(app, 'library_registry',)
- and hasattr(app.library_registry, '_db')
- and app.library_registry._db
- ):
- if exception:
- app.library_registry._db.rollback()
+ @app.before_first_request
+ def set_secret_key(_db=None):
+ _db = _db or app._db
+ app.secret_key = ConfigurationSetting.sitewide_secret(_db, Configuration.SECRET_KEY)
+
+ @app.teardown_request
+ def shutdown_session(exception):
+ """Commit or rollback the database session associated with the request"""
+ if (
+ hasattr(app, 'library_registry',) and
+ hasattr(app.library_registry, '_db') and
+ app.library_registry._db
+ ):
+ if exception:
+ app.library_registry._db.rollback()
+ else:
+ app.library_registry._db.commit()
+
+ @app.route('/')
+ @uses_location
+ @returns_problem_detail
+ def nearby(_location):
+ return app.library_registry.registry_controller.nearby(_location)
+
+ @app.route('/qa')
+ @uses_location
+ @returns_problem_detail
+ def nearby_qa(_location):
+ return app.library_registry.registry_controller.nearby(_location, live=False)
+
+ @app.route("/register", methods=["GET", "POST"])
+ @returns_problem_detail
+ def register():
+ return app.library_registry.registry_controller.register()
+
+ @app.route('/search')
+ @uses_location
+ @returns_problem_detail
+ def search(_location):
+ return app.library_registry.registry_controller.search(_location)
+
+ @app.route('/qa/search')
+ @uses_location
+ @returns_problem_detail
+ def search_qa(_location):
+ return app.library_registry.registry_controller.search(
+ _location, live=False
+ )
+
+ @app.route('/confirm//')
+ @returns_problem_detail
+ def confirm_resource(resource_id, secret):
+ return app.library_registry.validation_controller.confirm(resource_id, secret)
+
+ @app.route('/libraries')
+ @compressible
+ @uses_location
+ @returns_problem_detail
+ def libraries_opds(_location=None):
+ return app.library_registry.registry_controller.libraries_opds(location=_location)
+
+ @app.route('/libraries/qa')
+ @compressible
+ @uses_location
+ @returns_problem_detail
+ def libraries_qa(_location=None):
+ return app.library_registry.registry_controller.libraries_opds(location=_location, live=False)
+
+ @app.route('/admin/log_in', methods=["POST"])
+ @returns_problem_detail
+ def log_in():
+ return app.library_registry.registry_controller.log_in()
+
+ @app.route('/admin/log_out')
+ @returns_problem_detail
+ def log_out():
+ return app.library_registry.registry_controller.log_out()
+
+ @app.route('/admin/libraries')
+ @returns_json_or_response_or_problem_detail
+ def libraries():
+ return app.library_registry.registry_controller.libraries()
+
+ @app.route('/admin/libraries/qa')
+ @returns_json_or_response_or_problem_detail
+ def libraries_qa_admin():
+ return app.library_registry.registry_controller.libraries(live=False)
+
+ @app.route('/admin/libraries/')
+ @returns_json_or_response_or_problem_detail
+ def library_details(uuid):
+ return app.library_registry.registry_controller.library_details(uuid)
+
+ @app.route('/admin/libraries/search_details', methods=["POST"])
+ @returns_json_or_response_or_problem_detail
+ def search_details():
+ return app.library_registry.registry_controller.search_details()
+
+ @app.route('/admin/libraries/email', methods=["POST"])
+ @returns_json_or_response_or_problem_detail
+ def validate_email():
+ return app.library_registry.registry_controller.validate_email()
+
+ @app.route('/admin/libraries/registration', methods=["POST"])
+ @returns_json_or_response_or_problem_detail
+ def edit_registration():
+ return app.library_registry.registry_controller.edit_registration()
+
+ @app.route('/admin/libraries/pls_id', methods=["POST"])
+ @returns_json_or_response_or_problem_detail
+ def pls_id():
+ return app.library_registry.registry_controller.add_or_edit_pls_id()
+
+ @app.route('/library/')
+ @has_library
+ @returns_json_or_response_or_problem_detail
+ def library():
+ return app.library_registry.registry_controller.library()
+
+ @app.route('/library//eligibility')
+ @has_library
+ @returns_problem_detail
+ def library_eligibility():
+ return app.library_registry.coverage_controller.eligibility_for_library()
+
+ @app.route('/library//focus')
+ @has_library
+ @returns_problem_detail
+ def library_focus():
+ return app.library_registry.coverage_controller.focus_for_library()
+
+ @app.route('/coverage')
+ @returns_problem_detail
+ def coverage():
+ return app.library_registry.coverage_controller.lookup()
+
+ @app.route('/heartbeat')
+ @returns_problem_detail
+ def hearbeat():
+ return app.library_registry.heartbeat.heartbeat()
+
+ # Adobe Vendor ID implementation
+ @app.route('/AdobeAuth/SignIn', methods=['POST'])
+ @returns_problem_detail
+ def adobe_vendor_id_signin():
+ if app.library_registry.adobe_vendor_id:
+ return app.library_registry.adobe_vendor_id.signin_handler()
else:
- app.library_registry._db.commit()
-
-@app.route('/')
-@uses_location
-@returns_problem_detail
-def nearby(_location):
- return app.library_registry.registry_controller.nearby(_location)
-
-@app.route('/qa')
-@uses_location
-@returns_problem_detail
-def nearby_qa(_location):
- return app.library_registry.registry_controller.nearby(
- _location, live=False
- )
-
-@app.route("/register", methods=["GET","POST"])
-@returns_problem_detail
-def register():
- return app.library_registry.registry_controller.register()
-
-@app.route('/search')
-@uses_location
-@returns_problem_detail
-def search(_location):
- return app.library_registry.registry_controller.search(_location)
-
-@app.route('/qa/search')
-@uses_location
-@returns_problem_detail
-def search_qa(_location):
- return app.library_registry.registry_controller.search(
- _location, live=False
- )
-
-@app.route('/confirm//')
-@returns_problem_detail
-def confirm_resource(resource_id, secret):
- return app.library_registry.validation_controller.confirm(
- resource_id, secret
- )
-
-@app.route('/libraries')
-@compressible
-@uses_location
-@returns_problem_detail
-def libraries_opds(_location=None):
- return app.library_registry.registry_controller.libraries_opds(location=_location)
-
-@app.route('/libraries/qa')
-@compressible
-@uses_location
-@returns_problem_detail
-def libraries_qa(_location=None):
- return app.library_registry.registry_controller.libraries_opds(location=_location, live=False)
-
-@app.route('/admin/log_in', methods=["POST"])
-@returns_problem_detail
-def log_in():
- return app.library_registry.registry_controller.log_in()
-
-@app.route('/admin/log_out')
-@returns_problem_detail
-def log_out():
- return app.library_registry.registry_controller.log_out()
-
-@app.route('/admin/libraries')
-@returns_json_or_response_or_problem_detail
-def libraries():
- return app.library_registry.registry_controller.libraries()
-
-@app.route('/admin/libraries/qa')
-@returns_json_or_response_or_problem_detail
-def libraries_qa_admin():
- return app.library_registry.registry_controller.libraries(live=False)
-
-@app.route('/admin/libraries/')
-@returns_json_or_response_or_problem_detail
-def library_details(uuid):
- return app.library_registry.registry_controller.library_details(uuid)
-
-@app.route('/admin/libraries/search_details', methods=["POST"])
-@returns_json_or_response_or_problem_detail
-def search_details():
- return app.library_registry.registry_controller.search_details()
-
-@app.route('/admin/libraries/email', methods=["POST"])
-@returns_json_or_response_or_problem_detail
-def validate_email():
- return app.library_registry.registry_controller.validate_email()
-
-@app.route('/admin/libraries/registration', methods=["POST"])
-@returns_json_or_response_or_problem_detail
-def edit_registration():
- return app.library_registry.registry_controller.edit_registration()
-
-@app.route('/admin/libraries/pls_id', methods=["POST"])
-@returns_json_or_response_or_problem_detail
-def pls_id():
- return app.library_registry.registry_controller.add_or_edit_pls_id()
-
-@app.route('/library/')
-@has_library
-@returns_json_or_response_or_problem_detail
-def library():
- return app.library_registry.registry_controller.library()
-
-@app.route('/library//eligibility')
-@has_library
-@returns_problem_detail
-def library_eligibility():
- return app.library_registry.coverage_controller.eligibility_for_library()
-
-@app.route('/library//focus')
-@has_library
-@returns_problem_detail
-def library_focus():
- return app.library_registry.coverage_controller.focus_for_library()
-
-@app.route('/coverage')
-@returns_problem_detail
-def coverage():
- return app.library_registry.coverage_controller.lookup()
-
-
-@app.route('/heartbeat')
-@returns_problem_detail
-def hearbeat():
- return app.library_registry.heartbeat.heartbeat()
-
-# Adobe Vendor ID implementation
-@app.route('/AdobeAuth/SignIn', methods=['POST'])
-@returns_problem_detail
-def adobe_vendor_id_signin():
- if app.library_registry.adobe_vendor_id:
- return app.library_registry.adobe_vendor_id.signin_handler()
- else:
- return Response("", 404)
+ return Response("", 404)
-@app.route('/AdobeAuth/AccountInfo', methods=['POST'])
-@returns_problem_detail
-def adobe_vendor_id_accountinfo():
- if app.library_registry.adobe_vendor_id:
- return app.library_registry.adobe_vendor_id.userinfo_handler()
- else:
- return Response("", 404)
+ @app.route('/AdobeAuth/AccountInfo', methods=['POST'])
+ @returns_problem_detail
+ def adobe_vendor_id_accountinfo():
+ if app.library_registry.adobe_vendor_id:
+ return app.library_registry.adobe_vendor_id.userinfo_handler()
+ else:
+ return Response("", 404)
-@app.route('/AdobeAuth/Status')
-@returns_problem_detail
-def adobe_vendor_id_status():
- if app.library_registry.adobe_vendor_id:
- return app.library_registry.adobe_vendor_id.status_handler()
- else:
- return Response("", 404)
+ @app.route('/AdobeAuth/Status')
+ @returns_problem_detail
+ def adobe_vendor_id_status():
+ if app.library_registry.adobe_vendor_id:
+ return app.library_registry.adobe_vendor_id.status_handler()
+ else:
+ return Response("", 404)
+ @app.route('/admin/', strict_slashes=False)
+ def admin_view():
+ return app.library_registry.view_controller()
-@app.route('/admin/', strict_slashes=False)
-def admin_view():
- return app.library_registry.view_controller()
+ return app
if __name__ == '__main__':
debug = True
+ app = create_app()
+
if len(sys.argv) > 1:
url = sys.argv[1]
else:
- url = ConfigurationSetting.sitewide(_db, Configuration.BASE_URL).value
+ url = ConfigurationSetting.sitewide(app._db, Configuration.BASE_URL).value
+
url = url or 'http://localhost:7000/'
- scheme, netloc, path, parameters, query, fragment = urllib.parse.urlparse(url)
+ (scheme, netloc, path, parameters, query, fragment) = urllib.parse.urlparse(url)
+
if ':' in netloc:
host, port = netloc.split(':')
port = int(port)
diff --git a/app_helpers.py b/app_helpers.py
index 5fb4f560..f04d0187 100644
--- a/app_helpers.py
+++ b/app_helpers.py
@@ -1,49 +1,57 @@
-import flask
import gzip
+from flask import g, request, after_this_request
from io import BytesIO
from functools import wraps
from util import GeometryUtility
+from util.geo import Location, InvalidLocationException
from util.problem_detail import ProblemDetail
from util.flask_util import originating_ip
+
def has_library_factory(app):
- """Create a decorator that extracts a library uuid from request arguments.
- """
+ """Create a decorator that extracts a library uuid from request arguments"""
def factory(f):
@wraps(f)
def decorated(*args, **kwargs):
- """A decorator that extracts a library UUID from request
- arguments.
- """
- if 'uuid' in kwargs:
- uuid = kwargs.pop("uuid")
- else:
- uuid = None
- library = app.library_registry.registry_controller.library_for_request(
- uuid
- )
+ """A decorator that extracts a library UUID from request arguments"""
+ uuid = kwargs.pop("uuid", None)
+ library = app.library_registry.registry_controller.library_for_request(uuid)
+
if isinstance(library, ProblemDetail):
return library.response
else:
return f(*args, **kwargs)
+
return decorated
return factory
+
def uses_location_factory(app):
- """Create a decorator that guesses at a location for the client.
- """
+ """Create a decorator that guesses at a location for the client"""
def factory(f):
@wraps(f)
def decorated(*args, **kwargs):
"""A decorator that guesses at a location for the client."""
- location = flask.request.args.get("_location")
- if location:
- location = GeometryUtility.point_from_string(location)
- if not location:
- ip = originating_ip()
- location = GeometryUtility.point_from_ip(ip)
- return f(*args, _location=location, **kwargs)
+ raw_location = request.args.get("_location")
+ location_obj = None
+
+ if raw_location:
+ try:
+ location_obj = Location(raw_location)
+ except InvalidLocationException:
+ pass
+
+ if not location_obj:
+ try:
+ location_obj = Location(GeometryUtility.point_from_ip(originating_ip()))
+ except InvalidLocationException:
+ pass
+
+ if isinstance(location_obj, Location):
+ g.location = location_obj
+
+ return f(*args, **kwargs)
return decorated
return factory
@@ -63,22 +71,17 @@ def compressible(f):
"""
@wraps(f)
def compressor(*args, **kwargs):
- @flask.after_this_request
+ @after_this_request
def compress(response):
- if (response.status_code < 200 or
- response.status_code >= 300 or
- 'Content-Encoding' in response.headers):
- # Don't encode anything other than a 2xx response
- # code. Don't encode a response that's
- # already been encoded.
+ if (response.status_code < 200 or response.status_code >= 300 or 'Content-Encoding' in response.headers):
+ # Don't encode anything other than a 2xx. Don't encode a response that's already been encoded.
return response
- accept_encoding = flask.request.headers.get('Accept-Encoding', '')
- if not 'gzip' in accept_encoding.lower():
+ accept_encoding = request.headers.get('Accept-Encoding', '')
+ if 'gzip' not in accept_encoding.lower():
return response
- # At this point we know we're going to be changing the
- # outgoing response.
+ # At this point we know we're going to be changing the outgoing response.
# TODO: I understand what direct_passthrough does, but am
# not sure what it has to do with this, and commenting it
diff --git a/authentication_document.py b/authentication_document.py
index 2fed7371..a90c2ad3 100644
--- a/authentication_document.py
+++ b/authentication_document.py
@@ -1,46 +1,48 @@
-from collections import defaultdict
import json
+from collections import defaultdict
-from flask_babel import lazy_gettext as _
-from sqlalchemy.orm.exc import (
- MultipleResultsFound,
- NoResultFound,
-)
-
-from model import (
- get_one_or_create,
- Audience,
- CollectionSummary,
- Place,
- ServiceArea,
-)
+from flask_babel import lazy_gettext as lgt
+from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
+from sqlalchemy.orm.session import Session
+from constants import (AUTHENTICATION_DOCUMENT_MEDIA_TYPE, OPDS_CATALOG_MEDIA_TYPE)
+from model_helpers import get_one_or_create
+from model import (Audience, CollectionSummary, Place, ServiceArea)
from problem_details import INVALID_INTEGRATION_DOCUMENT
-from sqlalchemy.orm.session import Session
-class AuthenticationDocument(object):
- """Parse an Authentication For OPDS document, including the
- Library Simplified-specific extensions, extracting all the information
- that's of interest to the library registry.
+class AuthenticationDocument:
"""
-
- ANONYMOUS_ACCESS_REL = "https://librarysimplified.org/rel/auth/anonymous"
- AUTHENTICATION_DOCUMENT_REL = "http://opds-spec.org/auth/document"
- MEDIA_TYPE = "application/vnd.opds.authentication.v1.0+json"
-
- COVERAGE_EVERYWHERE = "everywhere"
-
- # The list of color schemes supported by SimplyE.
- SIMPLYE_COLOR_SCHEMES = [
- "red", "blue", "gray", "gold", "green", "teal", "purple",
+ Parse an Authentication For OPDS document, including the Library Simplified-specific extensions,
+ extracting all the information of interest to the library registry.
+ """
+ ##### Class Constants #################################################### # noqa: E266
+ ANONYMOUS_ACCESS_REL = "https://librarysimplified.org/rel/auth/anonymous" # noqa: E221
+ AUTHENTICATION_DOCUMENT_REL = "http://opds-spec.org/auth/document" # noqa: E221
+ MEDIA_TYPE = AUTHENTICATION_DOCUMENT_MEDIA_TYPE # noqa: E221
+ COVERAGE_EVERYWHERE = "everywhere" # noqa: E221
+ PUBLIC_AUDIENCE = 'public' # noqa: E221
+
+ AUDIENCES = [
+ PUBLIC_AUDIENCE,
+ 'educational-primary',
+ 'educational-secondary',
+ 'research',
+ 'print-disability',
+ 'other',
]
- PUBLIC_AUDIENCE = 'public'
- AUDIENCES = [PUBLIC_AUDIENCE, 'educational-primary',
- 'educational-secondary', 'research', 'print-disability',
- 'other']
+ SIMPLYE_COLOR_SCHEMES = [ # The list of color schemes supported by SimplyE.
+ "red",
+ "blue",
+ "gray",
+ "gold",
+ "green",
+ "teal",
+ "purple",
+ ]
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
def __init__(self, _db, id, title, authentication, service_description,
color_scheme, collection_size, public_key, audiences,
service_area, focus_area, links, place_class=Place):
@@ -52,214 +54,193 @@ def __init__(self, _db, id, title, authentication, service_description,
self.collection_size = collection_size
self.public_key = public_key
self.audiences = audiences or [self.PUBLIC_AUDIENCE]
- self.service_area, self.focus_area = self.parse_service_and_focus_area(
+
+ (self.service_area, self.focus_area) = self.parse_service_and_focus_area(
_db, service_area, focus_area, place_class
)
+
self.links = links
- self.website = self.extract_link(
- rel="alternate", require_type="text/html"
- )
+ self.website = self.extract_link(rel="alternate", require_type="text/html")
self.online_registration = self.has_link(rel="register")
- self.root = self.extract_link(
- rel="start",
- prefer_type="application/atom+xml;profile=opds-catalog"
- )
+ self.root = self.extract_link(rel="start", prefer_type=OPDS_CATALOG_MEDIA_TYPE)
+
logo = self.extract_link(rel="logo")
self.logo = None
self.logo_link = None
+
if logo:
data = logo.get('href', '')
if data and data.startswith('data:'):
self.logo = data
else:
self.logo_link = logo
+
self.anonymous_access = False
+
for flow in self.authentication_flows:
if flow.get('type') == self.ANONYMOUS_ACCESS_REL:
self.anonymous_access = True
break
- @property
- def authentication_flows(self):
- """Return all valid authentication flows in this document."""
- for i in self.authentication:
- if not isinstance(i, dict):
- # Not a valid authentication flow.
- continue
- yield i
-
def extract_link(self, rel, require_type=None, prefer_type=None):
- """Find a link with the given link relation in the main authentication
- document.
+ """
+ Find a link with the given link relation in the main authentication document.
Does not consider links found in the authentication flows.
:param rel: The link must use this as the link relation.
:param require_type: The link must have this as its type.
- :param prefer_type: A link with this type is better than a link of
- some other type.
+ :param prefer_type: A link with this type is better than a link of some other type.
"""
- return self._extract_link(
- self.links, rel, require_type, prefer_type
- )
+ return self._extract_link(self.links, rel, require_type, prefer_type)
def has_link(self, rel):
- """Is there a link with this link relation anywhere in the document?
+ """
+ Is there a link with this link relation anywhere in the document?
This checks both the main document and the authentication flows.
:rel: The link must have this link relation.
- :return: True if there is a link with the link relation in the document,
- False otherwise.
+ :return: True if there is a link with the link relation in the document, False otherwise.
"""
if self._extract_link(self.links, rel):
return True
- # We couldn't find a matching link in the main set of
- # links, but maybe there's a matching link associated with
- # a particular authentication flow.
+ # We couldn't find a matching link in the main set of links, but maybe there's a matching
+ # link associated with a particular authentication flow.
for flow in self.authentication_flows:
if self._extract_link(flow.get('links', []), rel):
return True
+
return False
+ def update_library(self, library):
+ """
+ Modify a library to reflect the current state of this AuthenticationDocument.
+
+ :param library: A Library.
+ :return: A ProblemDetail if there's a problem, otherwise None.
+ """
+ library.name = self.title
+ library.description = self.service_description
+ library.online_registration = self.online_registration
+ library.anonymous_access = self.anonymous_access
+
+ problem = self.update_audiences(library)
+
+ if not problem:
+ problem = self.update_service_areas(library)
+
+ if not problem:
+ problem = self.update_collection_size(library)
+
+ return problem
+
+ def update_audiences(self, library):
+ return self._update_audiences(library, self.audiences)
+
+ def update_collection_size(self, library):
+ return self._update_collection_size(library, self.collection_size)
+
+ def update_service_areas(self, library):
+ """Update a library's ServiceAreas based on the contents of this document"""
+ return self.set_service_areas(library, self.service_area, self.focus_area)
+
+ ##### Private Methods #################################################### # noqa: E266
+
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+ @property
+ def authentication_flows(self):
+ """Return all valid authentication flows in this document."""
+ for i in self.authentication:
+ if not isinstance(i, dict):
+ continue # Not a valid authentication flow.
+
+ yield i
+
+ ##### Class Methods ###################################################### # noqa: E266
@classmethod
- def parse_service_and_focus_area(cls, _db, service_area, focus_area,
- place_class=Place):
+ def parse_service_and_focus_area(cls, _db, service_area, focus_area, place_class=Place):
if service_area:
- service_area = cls.parse_coverage(
- _db, service_area, place_class=place_class
- )
+ service_area = cls.parse_coverage(_db, service_area, place_class=place_class)
else:
- service_area = [], {}, {}
+ service_area = [place_class.everywhere(_db)], {}, {}
+
if focus_area:
- focus_area = cls.parse_coverage(
- _db, focus_area, place_class=place_class
- )
+ focus_area = cls.parse_coverage(_db, focus_area, place_class=place_class)
else:
focus_area = service_area
+
return service_area, focus_area
@classmethod
def parse_coverage(cls, _db, coverage, place_class=Place):
- """Derive Place objects from an Authentication For OPDS coverage
- object (i.e. a value for `service_area` or `focus_area`)
+ """
+ Derive Place objects from an Authentication For OPDS coverage object
+ (i.e. a value for `service_area` or `focus_area`)
:param coverage: An Authentication For OPDS coverage object.
- :param place_class: In unit tests, pass in a mock replacement
- for the Place class here.
+ :param place_class: In unit tests, pass in a mock replacement for the Place class here.
:return: A 3-tuple (places, unknown, ambiguous).
`places` is a list of Place model objects.
- `unknown` is a coverage object representing the subset of
- `coverage` that had no corresponding Place objects. This
- object will not be used for any purpose except error display.
+ `unknown` is a coverage object representing the subset of `coverage` that had no corresponding
+ Place objects. This object will not be used for any purpose except error display.
- `ambiguous` is a coverage object representing the subset of
- `coverage` that had more than one corresponding Place
- object. This object will not be used for any purpose except
- error display.
+ `ambiguous` is a coverage object representing the subset of `coverage` that had more than one
+ corresponding Place object. This object will not be used for any purpose except error display.
"""
place_objs = []
unknown = defaultdict(list)
ambiguous = defaultdict(list)
- if coverage == cls.COVERAGE_EVERYWHERE:
- # This library covers the entire universe! No need to
- # parse anything.
- place_objs.append(place_class.everywhere(_db))
- coverage = dict() # Do no more processing
+ if coverage == cls.COVERAGE_EVERYWHERE: # This library covers the entire universe! No need to parse.
+ place_objs.append(place_class.everywhere(_db))
+ coverage = {} # Do no more processing
elif not isinstance(coverage, dict):
# The coverage is not in { nation: place } format.
# Convert it into that format using the default nation.
default_nation = place_class.default_nation(_db)
+
if default_nation:
- coverage = {default_nation.abbreviated_name : coverage }
+ coverage = {default_nation.abbreviated_name: coverage}
else:
- # Oops, that's not going to work. We don't know which
- # nation this place is in. Return a coverage object
- # that makes it semi-clear what the problem is.
+ # Oops, that's not going to work. We don't know which nation this place is in.
+ # Return a coverage object that makes it semi-clear what the problem is.
unknown["??"] = coverage
- coverage = dict() # Do no more processing
+ coverage = {} # Do no more processing
for nation, places in list(coverage.items()):
try:
- nation_obj = place_class.lookup_one_by_name(
- _db, nation, place_type=Place.NATION,
- )
- if places == cls.COVERAGE_EVERYWHERE:
- # This library covers an entire nation.
+ nation_obj = place_class.lookup_one_by_name(_db, nation, place_type=Place.NATION)
+
+ if places == cls.COVERAGE_EVERYWHERE: # This library covers an entire nation.
place_objs.append(nation_obj)
- else:
- # This library covers a list of places within a
- # nation.
+ else: # This library covers a list of places within a nation.
if isinstance(places, str):
- # This is invalid -- you're supposed to always
- # pass in a list -- but we can support it.
+ # This is invalid -- you're supposed to always pass in a list -- but we can support it.
places = [places]
+
for place in places:
try:
place_obj = nation_obj.lookup_inside(place)
- if place_obj:
- # We found it.
+
+ if place_obj: # We found it.
place_objs.append(place_obj)
- else:
- # We couldn't find any place with this name.
+ else: # We couldn't find any place with this name.
unknown[nation].append(place)
- except MultipleResultsFound as e:
- # The place was ambiguously named.
- ambiguous[nation].append(place)
- except MultipleResultsFound as e:
- # A nation was ambiguously named -- not very likely.
- ambiguous[nation] = places
- except NoResultFound as e:
- # Either this isn't a recognized nation
- # or we don't have a geography for it.
- unknown[nation] = places
- return place_objs, unknown, ambiguous
+ except MultipleResultsFound:
+ ambiguous[nation].append(place) # The place was ambiguously named.
- @classmethod
- def _extract_link(cls, links, rel, require_type=None, prefer_type=None):
- if require_type and prefer_type:
- raise ValueError(
- "At most one of require_type and prefer_type may be specified."
- )
- if not links:
- # There are no links, period.
- return None
- good_enough = None
- if not isinstance(links, list):
- # Invalid links object; ignore it.
- return
- for link in links:
- if rel != link.get('rel'):
- continue
- if not require_type and not prefer_type:
- # Any link with this relation will work. Return the
- # first one we see.
- return link
+ except MultipleResultsFound:
+ ambiguous[nation] = places # A nation was ambiguously named; not very likely.
+ except NoResultFound:
+ unknown[nation] = places # Unrecognized nation or we have no geography for it.
- # Beyond this point, either require_type or prefer_type is
- # set, so the type of the link becomes relevant.
- type = link.get('type', '')
-
- if type:
- if (require_type and type.startswith(require_type)
- or prefer_type and type.startswith(prefer_type)):
- # If we have a require_type, this means we have
- # met the requirement. If we have a prefer_type,
- # we will not find a better link than this
- # one. Return it immediately.
- return link
- if not require_type and not good_enough:
- # We would prefer a link of a certain type, but if it
- # turns out there is no such link, we will accept the
- # first link of the given type.
- good_enough = link
- return good_enough
+ return place_objs, unknown, ambiguous
@classmethod
def from_string(cls, _db, s, place_class=Place):
@@ -284,188 +265,172 @@ def from_dict(cls, _db, data, place_class=Place):
place_class=place_class
)
- def update_library(self, library):
- """Modify a library to reflect the current state of this
- AuthenticationDocument.
-
- :param library: A Library.
- :return: A ProblemDetail if there's a problem, otherwise None.
- """
- library.name = self.title
- library.description = self.service_description
- library.online_registration = self.online_registration
- library.anonymous_access = self.anonymous_access
-
- problem = self.update_audiences(library)
- if not problem:
- problem = self.update_service_areas(library)
- if not problem:
- problem = self.update_collection_size(library)
-
- return problem
-
- def update_audiences(self, library):
- return self._update_audiences(library, self.audiences)
-
- @classmethod
- def _update_audiences(self, library, audiences):
- original_audiences = audiences
- if not audiences:
- # Most of the libraries in this system are open to at
- # least some subset of the general public.
- audiences = [Audience.PUBLIC]
- if isinstance(audiences, str):
- # This is invalid but we can easily support it.
- audiences = [audiences]
- if not isinstance(audiences, list):
- return INVALID_INTEGRATION_DOCUMENT.detailed(
- _("'audience' must be a list: %(audiences)r",
- audiences=audiences)
- )
-
- # Unrecognized audiences become Audience.OTHER.
- filtered_audiences = set()
- for audience in audiences:
- if audience in Audience.KNOWN_AUDIENCES:
- filtered_audiences.add(audience)
- else:
- filtered_audiences.add(Audience.OTHER)
- audiences = filtered_audiences
-
- audience_objs = []
- _db = Session.object_session(library)
- for audience in audiences:
- audience_obj = Audience.lookup(_db, audience)
- audience_objs.append(audience_obj)
- library.audiences = audience_objs
-
- def update_service_areas(self, library):
- """Update a library's ServiceAreas based on the contents of this
- document.
- """
- return self.set_service_areas(
- library, self.service_area, self.focus_area
- )
-
@classmethod
def set_service_areas(cls, library, service_area, focus_area):
- """Replace a library's ServiceAreas with specific new values.
- """
+ """Replace a library's ServiceAreas with specific new values"""
service_areas = []
- old_service_areas = list(library.service_areas)
+ list(library.service_areas)
- # What service_area or focus_area looks like when
- # no input was specified.
- empty = [[],{},{}]
+ empty = [[], {}, {}] # What service_area or focus_area looks like when no input was specified.
if focus_area == empty and service_area == empty:
- # A library can't lose its entire coverage area -- it's
- # more likely that the coverage area was grandfathered in
- # and it just isn't set on the remote side.
- #
- # Do nothing.
+ # A library can't lose its entire coverage area -- it's more likely that the coverage area was
+ # grandfathered in and it just isn't set on the remote side.
return
- if (focus_area == empty and service_area != empty
- or service_area == focus_area):
- # Service area and focus area are the same, either because
- # they were defined that way explicitly or because focus
- # area was not specified.
+ if (focus_area == empty and service_area != empty or service_area == focus_area):
+ # Service area and focus area are the same, either because they were defined that way explicitly or
+ # because focus area was not specified.
#
- # Register the service area as the focus area and call it
- # a day.
- problem = cls._update_service_areas(
- library, service_area, ServiceArea.FOCUS,
- service_areas
- )
+ # Register the service area as the focus area and call it a day.
+ problem = cls._update_service_areas(library, service_area, ServiceArea.FOCUS, service_areas)
+
if problem:
return problem
else:
# Service area and focus area are different.
- problem = cls._update_service_areas(
- library, service_area, ServiceArea.ELIGIBILITY,
- service_areas
- )
+ problem = cls._update_service_areas(library, service_area, ServiceArea.ELIGIBILITY, service_areas)
+
if problem:
return problem
- problem = cls._update_service_areas(
- library, focus_area, ServiceArea.FOCUS,
- service_areas
- )
+
+ problem = cls._update_service_areas(library, focus_area, ServiceArea.FOCUS, service_areas)
+
if problem:
return problem
- # Delete any ServiceAreas associated with the given library
- # which are not mentioned in the list we just gathered.
+ # Delete ServiceAreas associated with the given library which are not mentioned in the list we just gathered.
library.service_areas = service_areas
+ ##### Private Class Methods ############################################## # noqa: E266
+ @classmethod
+ def _update_collection_size(self, library, sizes):
+ if isinstance(sizes, str) or isinstance(sizes, int):
+ sizes = {None: sizes} # A single collection with no known language.
+
+ if sizes is None:
+ sizes = {} # No collections are specified.
+
+ if not isinstance(sizes, dict):
+ return INVALID_INTEGRATION_DOCUMENT.detailed(
+ lgt("'collection_size' must be a number or an object mapping language codes to numbers")
+ )
+
+ new_collections = set()
+ unknown_size = 0
+
+ try:
+ for language, size in list(sizes.items()):
+ summary = CollectionSummary.set(library, language, size)
+ if summary.language is None:
+ unknown_size += summary.size
+ new_collections.add(summary)
+ if unknown_size:
+ # We found one or more collections in languages we didn't recognize. Set the total size of
+ # this collection as the size of a collection with unknown language.
+ new_collections.add(CollectionSummary.set(library, None, unknown_size))
+
+ except ValueError as e:
+ return INVALID_INTEGRATION_DOCUMENT.detailed(str(e))
+
+ # Destroy any CollectionSummaries representing collections no longer associated with this library.
+ library.collections = list(new_collections)
+
@classmethod
def _update_service_areas(cls, library, areas, type, service_areas):
- """Update a Library's ServiceAreas with a new set based on
- `areas`.
+ """
+ Update a Library's ServiceAreas with a new set based on `areas`.
:param library: A Library.
- :param areas: A list [place_objs, unknown, ambiguous]
- of the sort returned by `parse_coverage()`.
+ :param areas: A list [place_objs, unknown, ambiguous] of the sort returned by `parse_coverage()`.
:param type: A value to use for `ServiceAreas.type`.
- :param service_areas: All ServiceAreas that became associated
- with the Library will be inserted into this list.
+ :param service_areas: All ServiceAreas that became associated with the Library will be inserted into this list.
- :return: A ProblemDetailDocument if any of the service areas could
- not be transformed into Place objects. Otherwise, None.
+ :return: A ProblemDetailDocument if any of the service areas could not be transformed into Place objects.
+ Otherwise, None.
"""
_db = Session.object_session(library)
places, unknown, ambiguous = areas
if unknown or ambiguous:
msgs = []
if unknown:
- msgs.append(str(_("The following service area was unknown: %(service_area)s.", service_area=json.dumps(unknown))))
+ msgs.append(str(lgt(f"The following service area was unknown: {json.dumps(unknown)}.")))
if ambiguous:
- msgs.append(str(_("The following service area was ambiguous: %(service_area)s.", service_area=json.dumps(ambiguous))))
+ msgs.append(str(lgt(f"The following service area was ambiguous: {json.dumps(ambiguous)}.")))
return INVALID_INTEGRATION_DOCUMENT.detailed(" ".join(msgs))
for place in places:
- service_area, is_new = get_one_or_create(
- _db, ServiceArea, library_id=library.id,
- place_id=place.id, type=type
+ (service_area, _) = get_one_or_create(
+ _db, ServiceArea, library_id=library.id, place_id=place.id, type=type
)
service_areas.append(service_area)
- def update_collection_size(self, library):
- return self._update_collection_size(library, self.collection_size)
+ @classmethod
+ def _update_audiences(self, library, audiences):
+ if not audiences:
+ audiences = [Audience.PUBLIC]
+
+ if isinstance(audiences, str):
+ audiences = [audiences] # This is invalid but we can easily support it.
+
+ if not isinstance(audiences, list):
+ return INVALID_INTEGRATION_DOCUMENT.detailed(lgt(f"'audience' must be a list: {audiences}"))
+
+ filtered_audiences = set() # Unrecognized audiences become Audience.OTHER.
+
+ for audience in audiences:
+ if audience in Audience.KNOWN_AUDIENCES:
+ filtered_audiences.add(audience)
+ else:
+ filtered_audiences.add(Audience.OTHER)
+
+ audiences = filtered_audiences
+
+ audience_objs = []
+ _db = Session.object_session(library)
+
+ for audience in audiences:
+ audience_obj = Audience.lookup(_db, audience)
+ audience_objs.append(audience_obj)
+
+ library.audiences = audience_objs
@classmethod
- def _update_collection_size(self, library, sizes):
- if isinstance(sizes, str) or isinstance(sizes, int):
- # A single collection with no known language.
- sizes = { None: sizes }
- if sizes is None:
- # No collections are specified.
- sizes = {}
- if not isinstance(sizes, dict):
- return INVALID_INTEGRATION_DOCUMENT.detailed(
- _("'collection_size' must be a number or an object mapping language codes to numbers")
- )
+ def _extract_link(cls, links, rel, require_type=None, prefer_type=None):
+ if require_type and prefer_type:
+ raise ValueError("At most one of require_type and prefer_type may be specified.")
- new_collections = set()
- unknown_size = 0
- try:
- for language, size in list(sizes.items()):
- summary = CollectionSummary.set(library, language, size)
- if summary.language is None:
- unknown_size += summary.size
- new_collections.add(summary)
- if unknown_size:
- # We found one or more collections in languages we
- # didn't recognize. Set the total size of this collection
- # as the size of a collection with unknown language.
- new_collections.add(
- CollectionSummary.set(library, None, unknown_size)
- )
- except ValueError as e:
- return INVALID_INTEGRATION_DOCUMENT.detailed(str(e))
+ if not links:
+ return None # There are no links, period.
- # Destroy any CollectionSummaries representing collections
- # no longer associated with this library.
- library.collections = list(new_collections)
+ good_enough = None
+
+ if not isinstance(links, list):
+ return # Invalid links object; ignore it.
+
+ for link in links:
+ if rel != link.get('rel'):
+ continue
+
+ if not require_type and not prefer_type:
+ return link # Any link with this relation will work. Return the first one we see.
+
+ # Beyond this point, either require_type or prefer_type is set, so the type of the link becomes relevant.
+ link_type = link.get('type', '')
+
+ if link_type and (
+ require_type and link_type.startswith(require_type)
+ or
+ prefer_type and link_type.startswith(prefer_type)
+ ):
+ # If we have a require_type, this means we have met the requirement. If we have a prefer_type,
+ # we will not find a better link than this one. Return it immediately.
+ return link
+
+ if not require_type and not good_enough:
+ # We would prefer a link of a certain type, but if it turns out there is no such link,
+ # we will accept the first link of the given type.
+ good_enough = link
+
+ return good_enough
diff --git a/config.py b/config.py
index b6417503..14dafa06 100644
--- a/config.py
+++ b/config.py
@@ -1,8 +1,9 @@
import contextlib
import copy
-import json
import os
import logging
+from pathlib import Path
+
@contextlib.contextmanager
def temp_config(new_config=None, replacement_classes=None):
@@ -18,10 +19,17 @@ def temp_config(new_config=None, replacement_classes=None):
for c in replacement_classes:
c.instance = old_config
+
class CannotLoadConfiguration(Exception):
pass
+
+class CannotSendEmail(Exception):
+ pass
+
+
class Configuration(object):
+ DATADIR = Path(os.path.dirname(__file__)) / 'data'
instance = None
@@ -84,7 +92,7 @@ def database_url(cls, test=False):
url = os.environ.get(environment_variable)
if not url:
raise CannotLoadConfiguration(
- "Database URL was not defined in environment variable (%s) or configuration file." % environment_variable
+ f"Database URL was not defined in environment variable ({environment_variable}) or configuration file."
)
return url
@@ -105,7 +113,7 @@ def vendor_id(cls, _db):
delegates = []
try:
delegates = setting.json_value or []
- except ValueError as e:
+ except ValueError:
cls.log.warn("Invalid Adobe Vendor ID delegates configured.")
node = integration.setting(cls.ADOBE_VENDOR_ID_NODE_VALUE).value
diff --git a/constants.py b/constants.py
new file mode 100644
index 00000000..fdbbf61a
--- /dev/null
+++ b/constants.py
@@ -0,0 +1,186 @@
+##############################################################################
+# Sitewide Configuration Value Names
+##############################################################################
+
+ADOBE_VENDOR_ID = "vendor_id"
+
+ADOBE_VENDOR_ID_NODE_VALUE = "node_value"
+
+ADOBE_VENDOR_ID_DELEGATE_URL = "delegate_url"
+
+BASE_URL = "base_url"
+
+# Default nation for any place not explicitly in a particular nation.
+DEFAULT_NATION_ABBREVIATION = "default_nation_abbreviation"
+
+# For performance reasons, a registry may want to omit certain pieces of information from
+# large feeds. This sitewide setting controls how big a feed must be to be considered 'large'.
+LARGE_FEED_SIZE = "large_feed_size"
+
+# URL of the terms of service document for library registration
+REGISTRATION_TERMS_OF_SERVICE_URL = "registration_terms_of_service_url"
+
+# HTML snippet describing the ToS for library registration. It's better if this
+# is a short snippet of text with a link rather than the actual text of the ToS.
+REGISTRATION_TERMS_OF_SERVICE_HTML = "registration_terms_of_service_html"
+
+# Email address used for:
+# - From: address of transactional mail sent by the Library Registry
+# - contact address for people having problems with the registry
+REGISTRY_CONTACT_EMAIL = "registry_contact_email"
+
+# URL of a web based client to the registry. Must be templated and contain
+# a `{uuid}` expression to provide the web URL for a specific library.
+WEB_CLIENT_URL = "web_client_url"
+
+##############################################################################
+# Media Types
+##############################################################################
+
+AUTHENTICATION_DOCUMENT_MEDIA_TYPE = "application/vnd.opds.authentication.v1.0+json"
+
+PROBLEM_DETAIL_JSON_MEDIA_TYPE = "application/api-problem+json"
+
+OPDS_MEDIA_TYPE = "application/opds+json"
+
+OPDS_CATALOG_MEDIA_TYPE = "application/atom+xml;profile=opds-catalog"
+
+OPDS_1_MEDIA_TYPE = f"{OPDS_CATALOG_MEDIA_TYPE};kind=acquisition"
+
+OPDS_CATALOG_REGISTRATION_MEDIA_TYPE = (
+ "application/opds+json;profile=https://librarysimplified.org/rel/profile/directory"
+)
+
+OPENSEARCH_MEDIA_TYPE = "application/opensearchdescription+xml"
+
+##############################################################################
+# Relation URIs
+##############################################################################
+
+##############################################################################
+# Place Types
+##############################################################################
+PLACE_NATION = 'nation' # noqa: E221
+PLACE_STATE = 'state' # noqa: E221
+PLACE_COUNTY = 'county' # noqa: E221
+PLACE_CITY = 'city' # noqa: E221
+PLACE_POSTAL_CODE = 'postal_code' # noqa: E221
+PLACE_LIBRARY_SERVICE_AREA = 'library_service_area' # noqa: E221
+PLACE_EVERYWHERE = 'everywhere' # noqa: E221
+
+
+##############################################################################
+# Constant Classes
+##############################################################################
+class LibraryType:
+ """
+ Constant container for library types.
+
+ This is as defined here:
+
+ https://github.com/NYPL-Simplified/Simplified/wiki/LibraryRegistryPublicAPI#the-subject-scheme-for-library-types
+ """
+
+ SCHEME_URI = "http://librarysimplified.org/terms/library-types" # noqa: E221
+ LOCAL = "local" # noqa: E221
+ COUNTY = "county" # noqa: E221
+ STATE = "state" # noqa: E221
+ PROVINCE = "province" # noqa: E221
+ NATIONAL = "national" # noqa: E221
+ UNIVERSAL = "universal" # noqa: E221
+
+ # Different nations use different terms for referring to their
+ # administrative divisions, which translates into different terms in
+ # the library type vocabulary.
+ ADMINISTRATIVE_DIVISION_TYPES = {
+ "US": STATE,
+ "CA": PROVINCE,
+ }
+
+ NAME_FOR_CODE = {
+ LOCAL: "Local library",
+ COUNTY: "County library",
+ STATE: "State library",
+ PROVINCE: "Provincial library",
+ NATIONAL: "National library",
+ UNIVERSAL: "Online library",
+ }
+
+
+##############################################################################
+# Search Related
+##############################################################################
+US_STATES = {
+ "AL": "Alabama",
+ "AK": "Alaska",
+ "AR": "Arkansas",
+ "AZ": "Arizona",
+ "CA": "California",
+ "CO": "Colorado",
+ "CT": "Connecticut",
+ "DC": "District of Columbia",
+ "DE": "Delaware",
+ "FL": "Florida",
+ "GA": "Georgia",
+ "HI": "Hawaii",
+ "IA": "Iowa",
+ "ID": "Idaho",
+ "IL": "Illinois",
+ "IN": "Indiana",
+ "KS": "Kansas",
+ "KY": "Kentucky",
+ "LA": "Louisiana",
+ "MA": "Massachusetts",
+ "MD": "Maryland",
+ "ME": "Maine",
+ "MI": "Michigan",
+ "MN": "Minnesota",
+ "MO": "Missouri",
+ "MS": "Mississippi",
+ "MT": "Montana",
+ "NC": "North Carolina",
+ "ND": "North Dakota",
+ "NE": "Nebraska",
+ "NH": "New Hampshire",
+ "NJ": "New Jersey",
+ "NM": "New Mexico",
+ "NV": "Nevada",
+ "NY": "New York",
+ "OH": "Ohio",
+ "OK": "Oklahoma",
+ "OR": "Oregon",
+ "PA": "Pennsylvania",
+ "PR": "Puerto Rico",
+ "RI": "Rhode Island",
+ "SC": "South Carolina",
+ "SD": "South Dakota",
+ "TN": "Tennessee",
+ "TX": "Texas",
+ "UT": "Utah",
+ "VA": "Virginia",
+ "VT": "Vermont",
+ "WA": "Washington",
+ "WI": "Wisconsin",
+ "WV": "West Virginia",
+ "WY": "Wyoming",
+}
+
+US_STATE_ABBREVIATIONS = [abbreviation.lower() for abbreviation in US_STATES.keys()]
+
+US_STATE_NAMES = [state.lower() for state in US_STATES.values()]
+
+MULTI_WORD_STATE_NAMES = [name for name in US_STATE_NAMES if ' ' in name]
+
+LIBRARY_KEYWORDS = [
+ 'archive',
+ 'bookmobile',
+ 'bookmobiles',
+ 'college',
+ 'free',
+ 'library',
+ 'memorial',
+ 'public',
+ 'regional',
+ 'research',
+ 'university',
+]
diff --git a/controller.py b/controller.py
index c55cbe20..5f595795 100644
--- a/controller.py
+++ b/controller.py
@@ -1,99 +1,63 @@
-import datetime
-import logging
-import flask
-from flask_babel import lazy_gettext as _
-from flask import (
- Response,
- redirect,
- url_for,
- session,
-)
-import requests
-from sqlalchemy.orm import (
- defer,
- joinedload,
-)
-from smtplib import SMTPException
import json
-from Crypto.PublicKey import RSA
-from Crypto.Cipher import PKCS1_OAEP
-import os
+import logging
import time
+from smtplib import SMTPException
from urllib.parse import unquote
+from Crypto.Cipher import PKCS1_OAEP
+from Crypto.PublicKey import RSA
+from flask import (Response, g, redirect, render_template_string, request,
+ session, url_for)
+from flask_babel import lazy_gettext as lgt
+from sqlalchemy.orm import defer, joinedload
+
from adobe_vendor_id import AdobeVendorIDController
from authentication_document import AuthenticationDocument
+from config import (CannotLoadConfiguration, CannotSendEmail, Configuration)
from emailer import Emailer
-from model import (
- Admin,
- ConfigurationSetting,
- Hyperlink,
- Library,
- Place,
- Resource,
- ServiceArea,
- Validation,
- get_one,
- get_one_or_create,
- production_session,
-)
-from config import (
- Configuration,
- CannotLoadConfiguration,
-)
-from opds import (
- Annotator,
- OPDSCatalog,
-)
+from model import (Admin, ConfigurationSetting, Hyperlink, Library, Place,
+ Resource, ServiceArea, Validation, get_one,
+ get_one_or_create, production_session)
+from opds import Annotator, OPDSCatalog
+from problem_details import (AUTHENTICATION_FAILURE, INTEGRATION_ERROR,
+ INVALID_CONTACT_URI, INVALID_CREDENTIALS,
+ LIBRARY_NOT_FOUND, NO_AUTH_URL, UNABLE_TO_NOTIFY)
from registrar import LibraryRegistrar
from templates import admin as admin_template
-from util import GeometryUtility
-from util.app_server import (
- HeartbeatController,
- catalog_response,
-)
-from util.http import (
- HTTP,
-)
+from util.app_server import HeartbeatController, catalog_response
+from util.geo import Location
+from util.http import HTTP
from util.problem_detail import ProblemDetail
-from util.string_helpers import (
- base64,
- random_string,
-)
-from problem_details import *
+from util.string_helpers import base64, random_string
OPENSEARCH_MEDIA_TYPE = "application/opensearchdescription+xml"
-OPDS_CATALOG_REGISTRATION_MEDIA_TYPE = "application/opds+json;profile=https://librarysimplified.org/rel/profile/directory"
+OPDS_CATALOG_REGISTRATION_MEDIA_TYPE = "application/opds+json;profile=https://librarysimplified.org/rel/profile/directory" # noqa: E501
-class LibraryRegistry(object):
- def __init__(self, _db=None, testing=False, emailer_class=Emailer):
+class LibraryRegistry:
+ def __init__(self, _db=None, testing=False, emailer_class=Emailer):
self.log = logging.getLogger("Library registry web app")
if _db is None and not testing:
_db = production_session()
- self._db = _db
+ self._db = _db
self.testing = testing
-
self.setup_controllers(emailer_class)
def setup_controllers(self, emailer_class=Emailer):
"""Set up all the controllers that will be used by the web app."""
self.view_controller = ViewController(self)
- self.registry_controller = LibraryRegistryController(
- self, emailer_class
- )
+ self.registry_controller = LibraryRegistryController(self, emailer_class)
self.validation_controller = ValidationController(self)
self.coverage_controller = CoverageController(self)
-
self.heartbeat = HeartbeatController()
- vendor_id, node_value, delegates = Configuration.vendor_id(self._db)
+
+ (vendor_id, node_value, delegates) = Configuration.vendor_id(self._db)
+
if vendor_id:
- self.adobe_vendor_id = AdobeVendorIDController(
- self._db, vendor_id, node_value, delegates
- )
+ self.adobe_vendor_id = AdobeVendorIDController(self._db, vendor_id, node_value, delegates)
else:
self.adobe_vendor_id = None
@@ -109,29 +73,39 @@ def __init__(self, app):
def annotate_catalog(self, catalog, live=True):
"""Add links and metadata to every catalog."""
- if live:
- search_controller = "search"
- else:
- search_controller = "search_qa"
+ search_controller = "search" if live else "search_qa"
+
search_url = self.app.url_for(search_controller)
catalog.add_link_to_catalog(
- catalog.catalog, href=search_url, rel="search", type=OPENSEARCH_MEDIA_TYPE
+ catalog.catalog,
+ href=search_url,
+ rel="search",
+ type=OPENSEARCH_MEDIA_TYPE
)
+
register_url = self.app.url_for("register")
catalog.add_link_to_catalog(
- catalog.catalog, href=register_url, rel="register", type=OPDS_CATALOG_REGISTRATION_MEDIA_TYPE
+ catalog.catalog,
+ href=register_url,
+ rel="register",
+ type=OPDS_CATALOG_REGISTRATION_MEDIA_TYPE
)
# Add a templated link for getting a single library's entry.
library_url = unquote(self.app.url_for("library", uuid="{uuid}"))
catalog.add_link_to_catalog(
- catalog.catalog, href=library_url, rel="http://librarysimplified.org/rel/registry/library", type=OPDSCatalog.OPDS_TYPE, templated=True)
+ catalog.catalog,
+ href=library_url,
+ rel="http://librarysimplified.org/rel/registry/library",
+ type=OPDSCatalog.OPDS_TYPE,
+ templated=True
+ )
- vendor_id, ignore, ignore = Configuration.vendor_id(self.app._db)
+ (vendor_id, _, _) = Configuration.vendor_id(self.app._db)
catalog.catalog["metadata"]["adobe_vendor_id"] = vendor_id
-class BaseController(object):
+class BaseController:
def __init__(self, app):
self.app = app
self._db = self.app._db
@@ -140,113 +114,128 @@ def library_for_request(self, uuid):
"""Look up the library the user is trying to access."""
if not uuid:
return LIBRARY_NOT_FOUND
+
if not uuid.startswith("urn:uuid:"):
- uuid = "urn:uuid:" + uuid
+ uuid = f"urn:uuid:{uuid}"
+
library = Library.for_urn(self._db, uuid)
+
if not library:
return LIBRARY_NOT_FOUND
- flask.request.library = library
+
+ request.library = library
+
return library
class ViewController(BaseController):
def __call__(self):
username = session.get('username', '')
- response = Response(flask.render_template_string(
- admin_template,
- username=username
- ))
+ response = Response(render_template_string(admin_template, username=username))
return response
+
class LibraryRegistryController(BaseController):
- OPENSEARCH_TEMPLATE = """
-
- %(name)s
- %(description)s
- %(tags)s
-
- """
+ OPENSEARCH_TEMPLATE = (
+ """"""
+ """"""
+ """%(name)s"""
+ """%(description)s"""
+ """%(tags)s"""
+ """"""
+ """"""
+ )
def __init__(self, app, emailer_class=Emailer):
super(LibraryRegistryController, self).__init__(app)
self.annotator = LibraryRegistryAnnotator(app)
self.log = self.app.log
emailer = None
+
try:
emailer = emailer_class.from_sitewide_integration(self._db)
except CannotLoadConfiguration as e:
- self.log.error(
- "Cannot load email configuration. Will not be sending any emails.",
- exc_info=e
- )
+ msg = "Cannot load email configuration. Will not be sending any emails."
+ self.log.error(msg, exc_info=e)
+
self.emailer = emailer
def nearby(self, location, live=True):
- qu = Library.nearby(self._db, location, production=live)
+ if 'location' not in g or not isinstance(g.location, Location):
+ return 'foo'
+
+ qu = Library.nearby(self._db, g.location, production=live)
qu = qu.limit(5)
- if live:
- nearby_controller = 'nearby'
- else:
- nearby_controller = 'nearby_qa'
+ nearby_controller = 'nearby' if live else 'nearby_qa'
this_url = self.app.url_for(nearby_controller)
- catalog = OPDSCatalog(
- self._db, str(_("Libraries near you")), this_url, qu,
- annotator=self.annotator, live=live
- )
+
+ catalog = OPDSCatalog(self._db, str(lgt("Libraries near you")), this_url,
+ qu, annotator=self.annotator, live=live)
return catalog_response(catalog)
def search(self, location, live=True):
- query = flask.request.args.get('q')
- if live:
- search_controller = 'search'
- else:
- search_controller = 'search_qa'
- if query:
- # Run the query and send the results.
- results = Library.search(
- self._db, location, query, production=live
- )
-
- this_url = self.app.url_for(
- search_controller, q=query
- )
- catalog = OPDSCatalog(
- self._db, str(_('Search results for "%s"')) % query,
- this_url, results,
- annotator=self.annotator, live=live
- )
+ query = request.args.get('q')
+ search_controller = 'search' if live else 'search_qa'
+
+ if query: # Run the query and send the results.
+ results = Library.search(self._db, location, query, production=live)
+ this_url = self.app.url_for(search_controller, q=query)
+ catalog = OPDSCatalog(self._db, str(lgt('Search results for "%s"')) % query,
+ this_url, results, annotator=self.annotator, live=live)
return catalog_response(catalog)
- else:
- # Send the search form.
+ else: # Send the search form.
body = self.OPENSEARCH_TEMPLATE % dict(
- name=_("Find your library"),
- description=_("Search by ZIP code, city or library name."),
+ name=lgt("Find your library"),
+ description=lgt("Search by ZIP code, city or library name."),
tags="",
- url_template = self.app.url_for(search_controller) + "?q={searchTerms}"
- )
- headers = {}
- headers['Content-Type'] = OPENSEARCH_MEDIA_TYPE
- headers['Cache-Control'] = "public, no-transform, max-age: %d" % (
- 3600 * 24 * 30
+ url_template=self.app.url_for(search_controller) + "?q={searchTerms}"
)
+ headers = {
+ 'Content-Type': OPENSEARCH_MEDIA_TYPE,
+ 'Cache-Control': f"public, no-transform, max-age: {3600 * 24 * 30}",
+ }
return Response(body, 200, headers)
def libraries(self, live=True):
- # Return a specific set of information about all libraries in production; this generates the library list in the admin interface.
+ # Return a specific set of information about all libraries in production;
+ # this generates the library list in the admin interface.
# If :param live is set to False, libraries in testing will also be shown.
result = []
- libraries = self._db.query(Library).order_by(Library.name)
+ alphabetical = self._db.query(Library).order_by(Library.name)
+
+ # Load all the ORM objects we'll need for these libraries in a single query.
+ alphabetical = alphabetical.options(
+ joinedload(Library.hyperlinks),
+ joinedload('hyperlinks', 'resource'),
+ joinedload('hyperlinks', 'resource', 'validation'),
+ joinedload(Library.service_areas),
+ joinedload('service_areas', 'place'),
+ joinedload('service_areas', 'place', 'parent'),
+ joinedload(Library.settings),
+ )
+
+ # Avoid transferring large fields that we won't end up using.
+ alphabetical = alphabetical.options(defer('logo'))
+ alphabetical = alphabetical.options(defer('service_areas', 'place', 'geometry'))
+ alphabetical = alphabetical.options(defer('service_areas', 'place', 'parent', 'geometry'))
if live:
- libraries = libraries.filter(Library.registry_stage==Library.PRODUCTION_STAGE)
+ alphabetical = alphabetical.filter(Library.registry_stage == Library.PRODUCTION_STAGE)
+
+ libraries = list(alphabetical)
+
+ # Run a single database query to get patron counts for all
+ # relevant libraries, rather than calculating this one library
+ # at a time.
+ patron_counts = Library.patron_counts_by_library(self._db, libraries)
- for library in libraries:
+ for library in alphabetical:
uuid = library.internal_urn.split("uuid:")[1]
- result += [self.library_details(uuid, library)]
+ patron_count = patron_counts.get(library.id, 0)
+ result += [self.library_details(uuid, library, patron_count)]
data = dict(libraries=result)
- now = datetime.datetime.utcnow()
return data
def libraries_opds(self, live=True, location=None):
@@ -311,19 +300,59 @@ def libraries_opds(self, live=True, location=None):
self.log.info("Built library catalog in %.2fsec" % (b-a))
return catalog_response(catalog)
- def library_details(self, uuid, library=None):
- # Return complete information about one specific library.
+ def library_details(self, uuid, library=None, patron_count=None):
+ """Return complete information about one specific library.
+ :param uuid: UUID of the library in question.
+ :param library: Preloaded Library object for the library in question.
+ :param patron_count: Precalculated patron count for the library in question.
+ :return: A dict.
+ """
if not library:
library = self.library_for_request(uuid)
if isinstance(library, ProblemDetail):
return library
- hyperlink_types = [Hyperlink.INTEGRATION_CONTACT_REL, Hyperlink.HELP_REL, Hyperlink.COPYRIGHT_DESIGNATED_AGENT_REL]
- hyperlinks = [Library.get_hyperlink(library, x) for x in hyperlink_types]
- contact_email, help_email, copyright_email = [self._get_email(x) for x in hyperlinks]
- contact_email_validated_at, help_email_validated_at, copyright_email_validated_at = [self._validated_at(x) for x in hyperlinks]
- contact_email_hyperlink, help_email_hyperlink, copyright_email_hyperlink = hyperlinks
+ # It's presumed that associated Hyperlinks and
+ # ConfigurationSettings were loaded using joinedload(), as a
+ # performance optimization. To avoid further database access,
+ # we'll iterate over the preloaded objects and put the
+ # information into Python data structures.
+ hyperlink_types = [
+ Hyperlink.INTEGRATION_CONTACT_REL,
+ Hyperlink.HELP_REL,
+ Hyperlink.COPYRIGHT_DESIGNATED_AGENT_REL
+ ]
+ hyperlinks = dict()
+ for hyperlink in library.hyperlinks:
+ if hyperlink.rel not in hyperlink_types:
+ continue
+ hyperlinks[hyperlink.rel] = hyperlink
+ contact_email_hyperlink, help_email_hyperlink, copyright_email_hyperlink = [
+ hyperlinks.get(rel, None) for rel in hyperlink_types
+ ]
+ contact_email, help_email, copyright_email = [
+ self._get_email(hyperlinks.get(rel, None)) for rel in hyperlink_types
+ ]
+ contact_email_validated_at, help_email_validated_at, copyright_email_validated_at = [
+ self._validated_at(hyperlinks.get(rel, None)) for rel in hyperlink_types
+ ]
+
+ setting_types = [Library.PLS_ID]
+ settings = dict()
+ for s in library.settings:
+ if s.key not in setting_types or s.external_integration is not None:
+ continue
+ # We use _value to access the database value directly,
+ # instead of the 'value' hybrid property, which creates
+ # the possibility that we'll have to go to the database to
+ # try to find a default we know isn't there.
+ settings[s.key] = s._value
+ pls_id = settings.get(Library.PLS_ID, None)
+
+ if patron_count is None:
+ patron_count = library.number_of_patrons
+ num_patrons = str(patron_count)
basic_info = dict(
name=library.name,
@@ -332,8 +361,8 @@ def library_details(self, uuid, library=None):
timestamp=library.timestamp,
internal_urn=library.internal_urn,
online_registration=str(library.online_registration),
- pls_id=library.pls_id.value,
- number_of_patrons=str(library.number_of_patrons)
+ pls_id=pls_id,
+ number_of_patrons=num_patrons
)
urls_and_contact = dict(
contact_email=contact_email,
@@ -346,7 +375,10 @@ def library_details(self, uuid, library=None):
opds_url=library.opds_url,
web_url=library.web_url,
)
+
+ # This will be slow unless ServiceArea has been preloaded with a joinedload().
areas = self._areas(library.service_areas)
+
stages = dict(
library_stage=library._library_stage,
registry_stage=library.registry_stage,
@@ -361,8 +393,7 @@ def _areas(self, areas):
return result
def _format_place_name(self, place):
- parent_name = (place.parent.abbreviated_name or place.parent.external_name) if place.parent else "unknown"
- return "%s (%s)" %(place.external_name, parent_name)
+ return place.human_friendly_name or 'Everywhere'
def _get_email(self, hyperlink):
if hyperlink and hyperlink.resource and hyperlink.resource.href:
@@ -377,55 +408,68 @@ def _validated_at(self, hyperlink):
return validated_at
def validate_email(self):
- # Manually validate an email address, without the admin having to click on a confirmation link
- uuid = flask.request.form.get("uuid")
- email = flask.request.form.get("email")
+ """Manually validate an email address, without the admin having to click on a confirmation link"""
+ uuid = request.form.get("uuid")
+ email = request.form.get("email")
library = self.library_for_request(uuid)
+
if isinstance(library, ProblemDetail):
return library
+
email_types = {
"contact_email": Hyperlink.INTEGRATION_CONTACT_REL,
"help_email": Hyperlink.HELP_REL,
"copyright_email": Hyperlink.COPYRIGHT_DESIGNATED_AGENT_REL
}
hyperlink = None
+
if email_types.get(email):
hyperlink = Library.get_hyperlink(library, email_types[email])
+
if not hyperlink or not hyperlink.resource or isinstance(hyperlink, ProblemDetail):
- return INVALID_CONTACT_URI.detailed(
- "The contact URI for this library is missing or invalid"
- )
- validation, is_new = get_one_or_create(self._db, Validation, resource=hyperlink.resource)
+ return INVALID_CONTACT_URI.detailed("The contact URI for this library is missing or invalid")
+
+ (validation, _) = get_one_or_create(self._db, Validation, resource=hyperlink.resource)
validation.restart()
validation.mark_as_successful()
return self.library_details(uuid)
def edit_registration(self):
- # Edit a specific library's registry_stage and library_stage based on information which an admin has submitted in the interface.
- uuid = flask.request.form.get("uuid")
+ """
+ Edit a specific library's registry_stage and library_stage based on information
+ which an admin has submitted in the interface.
+ """
+ uuid = request.form.get("uuid")
library = self.library_for_request(uuid)
+
if isinstance(library, ProblemDetail):
return library
- registry_stage = flask.request.form.get("Registry Stage")
- library_stage = flask.request.form.get("Library Stage")
+
+ registry_stage = request.form.get("Registry Stage")
+ library_stage = request.form.get("Library Stage")
library._library_stage = library_stage
library.registry_stage = registry_stage
+
return Response(str(library.internal_urn), 200)
def add_or_edit_pls_id(self):
- uuid = flask.request.form.get("uuid")
+ uuid = request.form.get("uuid")
library = self.library_for_request(uuid)
+
if isinstance(library, ProblemDetail):
return library
- pls_id = flask.request.form.get(Library.PLS_ID)
+
+ pls_id = request.form.get(Library.PLS_ID)
library.pls_id.value = pls_id
+
return Response(str(library.internal_urn), 200)
def log_in(self):
- username = flask.request.form.get("username")
- password = flask.request.form.get("password")
+ username = request.form.get("username")
+ password = request.form.get("password")
+
if Admin.authenticate(self._db, username, password):
session["username"] = username
return redirect(url_for('admin_view'))
@@ -433,12 +477,13 @@ def log_in(self):
return INVALID_CREDENTIALS
def log_out(self):
- session["username"] = "";
+ session["username"] = ""
return redirect(url_for('admin_view'))
def search_details(self):
- name = flask.request.form.get("name")
+ name = request.form.get("name")
search_results = Library.search(self._db, {}, name, production=False)
+
if search_results:
info = [self.library_details(lib.internal_urn.split("uuid:")[1], lib) for lib in search_results]
return dict(libraries=info)
@@ -446,10 +491,8 @@ def search_details(self):
return LIBRARY_NOT_FOUND
def library(self):
- library = flask.request.library
- this_url = self.app.url_for(
- 'library', uuid=library.internal_urn
- )
+ library = request.library
+ this_url = self.app.url_for('library', uuid=library.internal_urn)
catalog = OPDSCatalog(
self._db, library.name,
this_url, [library],
@@ -458,14 +501,12 @@ def library(self):
return catalog_response(catalog)
def render(self):
- response = Response(flask.render_template_string(
- admin_template
- ))
- return response
+ return Response(render_template_string(admin_template))
@property
def registration_document(self):
- """Serve a document that describes the registration process,
+ """
+ Serve a document that describes the registration process,
notably the terms of service for that process.
The terms of service are hosted elsewhere; we only know the
@@ -473,31 +514,26 @@ def registration_document(self):
"""
document = dict()
- # The terms of service may be encapsulated in a link to
- # a web page.
+ # The terms of service may be encapsulated in a link to a web page.
terms_of_service_url = ConfigurationSetting.sitewide(
self._db, Configuration.REGISTRATION_TERMS_OF_SERVICE_URL
).value
type = "text/html"
rel = "terms-of-service"
+
if terms_of_service_url:
- OPDSCatalog.add_link_to_catalog(
- document, rel=rel, type=type,
- href=terms_of_service_url,
- )
+ OPDSCatalog.add_link_to_catalog(document, rel=rel, type=type, href=terms_of_service_url)
# And/or the terms of service may be described in
# human-readable HTML, which we'll present as a data: link.
terms_of_service_html = ConfigurationSetting.sitewide(
self._db, Configuration.REGISTRATION_TERMS_OF_SERVICE_HTML
).value
+
if terms_of_service_html:
encoded = base64.b64encode(terms_of_service_html)
terms_of_service_link = "data:%s;base64,%s" % (type, encoded)
- OPDSCatalog.add_link_to_catalog(
- document, rel=rel, type=type,
- href=terms_of_service_link
- )
+ OPDSCatalog.add_link_to_catalog(document, rel=rel, type=type, href=terms_of_service_link)
return document
@@ -505,23 +541,25 @@ def catalog_response(self, document, status=200):
"""Serve an OPDS 2.0 catalog."""
if not isinstance(document, (bytes, str)):
document = json.dumps(document)
- headers = { "Content-Type": OPDS_CATALOG_REGISTRATION_MEDIA_TYPE }
- return Response(document, status, headers=headers)
+
+ return Response(document, status, headers={"Content-Type": OPDS_CATALOG_REGISTRATION_MEDIA_TYPE})
def register(self, do_get=HTTP.debuggable_get):
- if flask.request.method == 'GET':
+ if request.method == 'GET':
document = self.registration_document
return self.catalog_response(document)
- auth_url = flask.request.form.get("url")
+ auth_url = request.form.get("url")
self.log.info("Got request to register %s", auth_url)
+
if not auth_url:
return NO_AUTH_URL
- integration_contact_uri = flask.request.form.get("contact")
+ integration_contact_uri = request.form.get("contact")
integration_contact_email = integration_contact_uri
shared_secret = None
- auth_header = flask.request.headers.get('Authorization')
+ auth_header = request.headers.get('Authorization')
+
if auth_header and isinstance(auth_header, str) and "bearer" in auth_header.lower():
shared_secret = auth_header.split(' ', 1)[1]
self.log.info("Incoming shared secret: %s...", shared_secret[:4])
@@ -529,8 +567,7 @@ def register(self, do_get=HTTP.debuggable_get):
# If 'stage' is not provided, it means the client doesn't make the
# testing/production distinction. We have to assume they want
# production -- otherwise they wouldn't bother registering.
-
- library_stage = flask.request.form.get("stage")
+ library_stage = request.form.get("stage")
self.log.info("Incoming stage: %s", library_stage)
library_stage = library_stage or Library.PRODUCTION_STAGE
@@ -539,10 +576,10 @@ def register(self, do_get=HTTP.debuggable_get):
# every new library to be on a circulation manager that can meet
# this requirement.
#
- #integration_contact_email = self._required_email_address(
- # integration_contact_uri,
- # "Invalid or missing configuration contact email address"
- #)
+ # integration_contact_email = self._required_email_address(
+ # integration_contact_uri,
+ # "Invalid or missing configuration contact email address"
+ # )
if isinstance(integration_contact_email, ProblemDetail):
return integration_contact_email
@@ -561,108 +598,85 @@ def register(self, do_get=HTTP.debuggable_get):
library = get_one(self._db, Library, shared_secret=shared_secret)
if not library:
__transaction.rollback()
- return AUTHENTICATION_FAILURE.detailed(
- _("Provided shared secret is invalid")
- )
+ return AUTHENTICATION_FAILURE.detailed(lgt("Provided shared secret is invalid"))
# This gives the requestor an elevated level of permissions.
elevated_permissions = True
library_is_new = False
if library.authentication_url != auth_url:
- # The library's authentication URL has changed,
- # e.g. moved from HTTP to HTTPS. The registration
- # includes a valid shared secret, so it's okay to
- # modify the corresponding database field.
- #
- # We want to do this before the registration, so that
- # we request the new URL instead of the old one.
+ # The library's authentication URL has changed, e.g. moved from HTTP to HTTPS.
+ # The registration includes a valid shared secret, so it's okay to modify the
+ # corresponding database field.
+ # We want to do this before the registration, so that we request the new URL
+ # instead of the old one.
library.authentication_url = auth_url
if not library:
- # Either this is a library at a known authentication URL
- # or it's a brand new library.
- library, library_is_new = get_one_or_create(
- self._db, Library,
- authentication_url=auth_url
- )
+ # This is a library at a known authentication URL or a brand new library.
+ library, library_is_new = get_one_or_create(self._db, Library, authentication_url=auth_url)
registrar = LibraryRegistrar(self._db, do_get=do_get)
result = registrar.register(library, library_stage)
+
if isinstance(result, ProblemDetail):
__transaction.rollback()
return result
- # At this point registration (or re-registration) has
- # succeeded, so we won't be rolling back the subtransaction
- # that created the Library.
+ # At this point registration (or re-registration) has succeeded, so we won't be rolling
+ # back the subtransaction that created the Library.
__transaction.commit()
auth_document, hyperlinks_to_create = result
- # Now that we've completed the registration process, we
- # know the opds_url -- it's the 'start' link found in
- # the auth_document.
- #
- # Registration will fail if this link is missing or the
- # URL doesn't work, so we can assume this is valid.
+ # Now that we've completed the registration process, we know the opds_url -- it's the
+ # 'start' link found in the auth_document.
+ # Registration will fail if this link is missing or the URL doesn't work, so we can
+ # assume this is valid.
opds_url = auth_document.root['href']
if library_is_new:
- # The library was just created, so it had no opds_url.
- # Set it now.
+ # The library was just created, so it had no opds_url. Set that now.
library.opds_url = opds_url
- # The registration process may have queued up a number of
- # Hyperlinks that needed to be created (taken from the
- # library's authentication document), but we also need to
- # create a hyperlink for the integration contact provided with
- # the registration request itself.
+ # The registration process may have queued up a number of Hyperlinks that needed to
+ # be created (taken from the library's authentication document), but we also need to
+ # create a hyperlink for the integration contact provided with the registration request itself.
if integration_contact_email:
- hyperlinks_to_create.append(
- (Hyperlink.INTEGRATION_CONTACT_REL, [integration_contact_email])
- )
+ hyperlinks_to_create.append((Hyperlink.INTEGRATION_CONTACT_REL, [integration_contact_email]))
reset_shared_secret = False
if elevated_permissions:
- # If you have elevated permissions you may ask for the
- # shared secret to be reset.
- reset_shared_secret = flask.request.form.get(
- "reset_shared_secret", False
- )
+ # If you have elevated permissions you may ask for the shared secret to be reset.
+ reset_shared_secret = request.form.get("reset_shared_secret", False)
if library.opds_url != opds_url:
- # The library's OPDS URL has changed, e.g. moved from
- # HTTP to HTTPS. Since we have elevated permissions,
- # it's okay to modify the corresponding database
- # field.
+ # The library's OPDS URL has changed, e.g. moved from HTTP to HTTPS. Since we
+ # have elevated permissions, it's okay to modify the corresponding database field.
library.opds_url = opds_url
for rel, candidates in hyperlinks_to_create:
- hyperlink, is_modified = library.set_hyperlink(rel, *candidates)
+ (hyperlink, is_modified) = library.set_hyperlink(rel, *candidates)
if is_modified:
- # We need to send an email to this email address about
- # what just happened. This is either so the receipient
- # can confirm that the address works, or to inform
+ # We need to send an email to this email address about what just happened.
+ # This is either so the receipient can confirm that the address works, or to inform
# them a new library is using their address.
try:
hyperlink.notify(self.emailer, self.app.url_for)
- except SMTPException as e:
- # We were unable to send the email.
- return INTEGRATION_ERROR.detailed(
- _("SMTP error while sending email to %(address)s",
- address=hyperlink.resource.href)
+ except SMTPException: # We were unable to send the email.
+ msg = "SMTP error while sending email to %(address)s"
+ return INTEGRATION_ERROR.detailed(lgt(msg, address=hyperlink.resource.href))
+ except CannotSendEmail:
+ return UNABLE_TO_NOTIFY.detailed(
+ lgt("The Registry was unable to send a notification email.")
)
- # Create an OPDS 2 catalog containing all available
- # information about the library.
- catalog = OPDSCatalog.library_catalog(
- library, include_private_information=True,
- url_for=self.app.url_for
- )
+ # Create an OPDS 2 catalog containing all available info about the library.
+ catalog = OPDSCatalog.library_catalog(library, include_private_information=True,
+ url_for=self.app.url_for)
- # Annotate the catalog with some information specific to
- # the transaction that's happening right now.
+ # Annotate catalog with some info specific to the transaction happening right now.
public_key = auth_document.public_key
+
if public_key and public_key.get("type") == "RSA":
public_key = RSA.importKey(public_key.get("value"))
encryptor = PKCS1_OAEP.new(public_key)
@@ -672,28 +686,24 @@ def dupe_check(candidate):
return Library.for_short_name(self._db, candidate) is not None
library.short_name = Library.random_short_name(dupe_check)
- generate_secret = (
- (library.shared_secret is None) or reset_shared_secret
- )
+ generate_secret = ((library.shared_secret is None) or reset_shared_secret)
+
if generate_secret:
library.shared_secret = random_string(24)
- encrypted_secret = encryptor.encrypt(
- library.shared_secret.encode("utf8")
- )
+ encrypted_secret = encryptor.encrypt(library.shared_secret.encode("utf8"))
catalog["metadata"]["short_name"] = library.short_name
catalog["metadata"]["shared_secret"] = base64.b64encode(encrypted_secret)
- if library_is_new:
- status_code = 201
- else:
- status_code = 200
+ status_code = 201 if library_is_new else 200
+
return self.catalog_response(catalog, status_code)
class ValidationController(BaseController):
- """Validates Resources based on validation codes.
+ """
+ Validates Resources based on validation codes.
The confirmation codes were sent out in emails to the addresses that
need to be validated, or otherwise communicated to someone who needs
@@ -703,108 +713,99 @@ class ValidationController(BaseController):
MESSAGE_TEMPLATE = "%(message)s%(message)s"
def html_response(self, status_code, message):
- """Return a human-readable message as a minimal HTML page.
+ """
+ Return a human-readable message as a minimal HTML page.
This controller is used by human beings, so HTML is better
than Problem Detail Documents.
"""
- headers = {"Content-Type": "text/html"}
page = self.MESSAGE_TEMPLATE % dict(message=message)
- return Response(page, status_code, headers=headers)
+ return Response(page, status_code, headers={"Content-Type": "text/html"})
def confirm(self, resource_id, secret):
- """Confirm a secret for a URI, or don't.
+ """
+ Confirm a secret for a URI, or don't.
:return: A Response containing a simple HTML document.
"""
if not secret:
- return self.html_response(404, _("No confirmation code provided"))
+ return self.html_response(404, lgt("No confirmation code provided"))
+
if not resource_id:
- return self.html_response(404, _("No resource ID provided"))
+ return self.html_response(404, lgt("No resource ID provided"))
+
validation = get_one(self._db, Validation, secret=secret)
resource = get_one(self._db, Resource, id=resource_id)
+
if not resource:
- return self.html_response(404, _("No such resource"))
+ return self.html_response(404, lgt("No such resource"))
if not validation:
- # The secret is invalid. This might be because the secret
- # is wrong, or because the Resource has already been
- # validated.
- #
- # Let's eliminate the 'Resource has already been validated'
- # possibility and take care of the other case next.
+ # The secret is invalid. This might be because the secret is wrong, or because
+ # the Resource has already been validated.
+ # Let's eliminate the 'Resource has already been validated' possibility and
+ # take care of the other case next.
if resource and resource.validation and resource.validation.success:
- return self.html_response(200, _("This URI has already been validated."))
-
- if (not validation
- or not validation.resource
- or validation.resource.id != resource_id):
- # For whatever reason the resource ID and secret don't match.
- # A generic error that doesn't reveal information is appropriate
- # in all cases.
- error = _("Confirmation code %r not found") % secret
+ return self.html_response(200, lgt("This URI has already been validated."))
+
+ if (not validation or not validation.resource or validation.resource.id != resource_id):
+ # For whatever reason the resource ID and secret don't match. A generic error that
+ # doesn't reveal information is appropriate in all cases.
+ error = lgt("Confirmation code %r not found") % secret
return self.html_response(404, error)
- # At this point we know that the resource has not been
- # confirmed, and that the secret matches the resource. The
- # only other problem might be that the validation has expired.
+ # At this point we know the resource has not been confirmed, and that the secret matches
+ # the resource. The only other problem might be that the validation has expired.
if not validation.active:
- error = _("Confirmation code %r has expired. Re-register to get another code.") % secret
+ error = lgt("Confirmation code %r has expired. Re-register to get another code.") % secret
return self.html_response(400, error)
+
validation.mark_as_successful()
resource = validation.resource
- message = _("You successfully confirmed %s.") % resource.href
+ message = lgt("You successfully confirmed %s.") % resource.href
+
return self.html_response(200, message)
class CoverageController(BaseController):
- """Converts coverage area descriptions to GeoJSON documents
- so they can be visualized.
- """
-
+ """Converts coverage area descriptions to GeoJSON documents so they can be visualized"""
def geojson_response(self, document):
if isinstance(document, dict):
document = json.dumps(document)
- headers = {"Content-Type": "application/geo+json"}
- return Response(document, 200, headers=headers)
+
+ return Response(document, 200, headers={"Content-Type": "application/geo+json"})
def lookup(self):
- coverage = flask.request.args.get('coverage')
+ coverage = request.args.get('coverage')
+
try:
coverage = json.loads(coverage)
- except ValueError as e:
+ except ValueError:
pass
- places, unknown, ambiguous = AuthenticationDocument.parse_coverage(
- self._db, coverage
- )
+
+ (places, unknown, ambiguous) = AuthenticationDocument.parse_coverage(self._db, coverage)
document = Place.to_geojson(self._db, *places)
- # Extend the GeoJSON with extra information about parts of the
- # coverage document we found ambiguous or couldn't associate
- # with a Place.
+ # Extend the GeoJSON with extra information about parts of the coverage document we found
+ # ambiguous or couldn't associate with a Place.
if unknown:
document['unknown'] = unknown
+
if ambiguous:
document['ambiguous'] = ambiguous
+
return self.geojson_response(document)
def _geojson_for_service_area(self, service_type):
- """Serve a GeoJSON document describing some subset of the active
- library's service areas.
- """
- areas = [x.place for x in flask.request.library.service_areas
- if x.type==service_type]
+ """Serve a GeoJSON document describing some subset of the active library's service areas"""
+ areas = [x.place for x in request.library.service_areas if x.type == service_type]
return self.geojson_response(Place.to_geojson(self._db, *areas))
def eligibility_for_library(self):
- """Serve a GeoJSON document representing the eligibility area
- for a specific library.
- """
+ """Serve a GeoJSON document representing the eligibility area for a specific library"""
return self._geojson_for_service_area(ServiceArea.ELIGIBILITY)
def focus_for_library(self):
- """Serve a GeoJSON document representing the focus area
- for a specific library.
- """
+ """Serve a GeoJSON document representing the focus area for a specific library"""
return self._geojson_for_service_area(ServiceArea.FOCUS)
diff --git a/data/uszipcode/simple_db.sqlite b/data/uszipcode/simple_db.sqlite
new file mode 100644
index 00000000..1710d1fb
Binary files /dev/null and b/data/uszipcode/simple_db.sqlite differ
diff --git a/decorators.py b/decorators.py
new file mode 100644
index 00000000..34c65bae
--- /dev/null
+++ b/decorators.py
@@ -0,0 +1,164 @@
+from functools import wraps
+from io import BytesIO
+import gzip
+
+from flask import jsonify, Response, g, request
+from flask_sqlalchemy_session import current_session
+
+from model import Library
+from util import GeometryUtility
+from util.flask_util import originating_ip
+from util.geo import Location, InvalidLocationException
+from util.problem_detail import ProblemDetail
+from problem_details import LIBRARY_NOT_FOUND
+
+
+def deprecated_route(f):
+ """Report usage of a deprecated route"""
+ @wraps(f)
+ def decorated(*args, **kwargs):
+ # TODO: Log the usage of a deprecated route and emit a metric
+
+ return f(*args, **kwargs)
+
+ return decorated
+
+
+def uses_location(f):
+ """
+ Attempts to guess a location for a request, based on either:
+ - A '_location' string value in request.args, formatted as ','
+ - Failing that, the originating IP address of the request, from either
+ - The value of an 'X-Forwarded-For' header (expected from Nginx)
+ - Failing that, the value of request.remote_addr
+
+ Adds the found location (or None) to g.location as a geometry string
+ (ex: 'SRID=4326;POINT(74.006 40.7128)')
+ """
+ @wraps(f)
+ def decorated(*args, **kwargs):
+ raw_location = request.args.get("_location", None)
+ location_obj = None
+
+ if raw_location: # See if what we got in args creates a valid location
+ try:
+ location_obj = Location(raw_location)
+ except InvalidLocationException:
+ pass
+
+ if not location_obj: # Try getting a location off the client's IP
+ try:
+ location_obj = Location(GeometryUtility.point_from_ip(originating_ip()))
+ except InvalidLocationException:
+ pass
+
+ g.location = location_obj
+
+ return f(*args, **kwargs)
+
+ return decorated
+
+
+def has_library(f):
+ """
+ Places a Library instance into g.library, based on a uuid URL parameter.
+
+ The uuid maps to Library.internal_urn, and may be in the following formats:
+ - a UUID as output by str(uuid.uuid4())
+ - a string beginning with "urn:uuid:" followed by a stringified uuid4() value
+ """
+ @wraps(f)
+ def decorated(*args, **kwargs):
+ uuid_string = kwargs.pop("uuid", None)
+ if not uuid_string:
+ return LIBRARY_NOT_FOUND.response
+
+ if not uuid_string.startswith("urn:uuid:"):
+ uuid_string = "urn:uuid:" + uuid_string
+
+ library = Library.for_urn(current_session, uuid_string)
+
+ if not library:
+ return LIBRARY_NOT_FOUND.response
+
+ g.library = library
+
+ return f(*args, **kwargs)
+
+ return decorated
+
+
+def returns_problem_detail(f):
+ """
+ Allows a view function, on error, to return a specific ProblemDetail instance,
+ which will be rendered into a flask Response object.
+ """
+ @wraps(f)
+ def decorated(*args, **kwargs):
+ v = f(*args, **kwargs)
+
+ if isinstance(v, ProblemDetail):
+ return v.response
+
+ return v
+
+ return decorated
+
+
+def returns_json_or_response_or_problem_detail(f):
+ """
+ Provides a usable Response for view functions which return any of:
+ - A Python data structure (will be run through flask.jsonify())
+ - A ProblemDetail instance
+ - An instance of flask.Response or a subclass thereof
+ """
+ @wraps(f)
+ def decorated(*args, **kwargs):
+ v = f(*args, **kwargs)
+
+ if isinstance(v, ProblemDetail):
+ return v.response
+
+ if isinstance(v, Response):
+ return v
+
+ return jsonify(**v)
+
+ return decorated
+
+
+def compressible(f):
+ """
+ Compress the outgoing response payload using gzip if:
+ * The response being rendered by the view is not a ProblemDetail, etc.
+ * The request included an 'Accept-Encoding' header whose value includes 'gzip'
+ * The response being rendered by the view carries a 2xx status code
+ * The response body is not already explicitly encoded
+ """
+ @wraps(f)
+ def decorated(*args, **kwargs):
+ response = f(*args, **kwargs)
+ accept_encoding = request.headers.get('Accept-Encoding', '')
+
+ if ( # Reasons to exit early, without compressing:
+ not isinstance(response, Response) or # - We don't want to compress non-Response data
+ 'gzip' not in accept_encoding.lower() or # - They didn't ask for compression
+ not (199 < response.status_code < 300) or # - It's not a 2xx response--we only compress 2xx
+ 'Content-Encoding' in response.headers # - It's already been encoded, don't mess with it
+ ):
+ return response
+
+ # Perform the compression on the response data
+ buffer = BytesIO()
+ with gzip.GzipFile(mode='wb', fileobj=buffer) as gzipped:
+ gzipped.write(response.data)
+ response.data = buffer.getvalue()
+
+ response.direct_passthrough = False # This skips some Werkzeug/Flask checks, unneeded for a binary payload.
+ response.headers['Content-Encoding'] = 'gzip'
+ response.headers['Vary'] = 'Accept-Encoding' # TODO: This is bad if Vary is already set.
+ response.headers['Content-Length'] = len(response.data)
+
+ return response
+
+ return decorated
diff --git a/docker-compose-cicd.yml b/docker-compose-cicd.yml
index c03f3eef..c49c309a 100644
--- a/docker-compose-cicd.yml
+++ b/docker-compose-cicd.yml
@@ -1,4 +1,4 @@
-version: "3.9"
+version: "3.7"
services:
libreg_test_db:
@@ -8,20 +8,16 @@ services:
target: libreg_local_db
volumes:
- local_db_data:/var/lib/postgresql/data
- ports:
- - "5432:5432"
- libreg_prod_webapp:
- container_name: libreg_prod_webapp
+ libreg_active_webapp:
+ container_name: libreg_active_webapp
depends_on:
- libreg_test_db
build:
context: .
- target: libreg_prod
+ target: libreg_active
labels:
- "com.nypl.docker.imagename=library_registry"
- ports:
- - "80:80"
environment:
- SIMPLIFIED_TEST_DATABASE=postgresql://simplified_test:simplified_test@libreg_test_db:5432/simplified_registry_test
- SIMPLIFIED_PRODUCTION_DATABASE=postgresql://simplified:simplified@libreg_test_db:5432/simplified_registry_dev
diff --git a/docker-compose.yml b/docker-compose.yml
index c3a1c38e..10e7db69 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.9"
+version: "3.7"
services:
libreg_local_db:
@@ -19,7 +19,7 @@ services:
- libreg_local_db
build:
context: .
- target: libreg_dev
+ target: libreg_local
ports:
- "80:80"
environment:
@@ -36,4 +36,4 @@ services:
target: /registry_admin
volumes:
- local_db_data:
\ No newline at end of file
+ local_db_data:
diff --git a/emailer.py b/emailer.py
index 237c18f8..174ccaca 100644
--- a/emailer.py
+++ b/emailer.py
@@ -2,60 +2,66 @@
from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText
from email import charset
-import email
import smtplib
+from config import CannotLoadConfiguration, CannotSendEmail
+
# Set up an encoding/decoding between UTF-8 and quoted-printable.
# Otherwise, the bodies of email messages will be encoded with base64
# and they'll be hard to read. This way, only the non-ASCII characters
# need to be encoded.
charset.add_charset('utf-8', charset.QP, charset.QP, 'utf-8')
-from config import (
- CannotLoadConfiguration,
-)
-
-class Emailer(object):
+class Emailer:
"""A class for sending small amounts of email."""
-
+ ##### Class Constants #################################################### # noqa: E266
# Goal and setting names for the ExternalIntegration.
- GOAL = 'email'
- PORT = 'port'
- FROM_ADDRESS = 'from_address'
- FROM_NAME = 'from_name'
-
- DEFAULT_FROM_NAME = 'Library Simplified registry support'
+ GOAL = 'email' # noqa: E221
+ PORT = 'port' # noqa: E221
+ FROM_ADDRESS = 'from_address' # noqa: E221
+ FROM_NAME = 'from_name' # noqa: E221
+ DEFAULT_FROM_NAME = 'Library Simplified registry support' # noqa: E221
# Constants for different types of email.
- ADDRESS_DESIGNATED = 'address_designated'
- ADDRESS_NEEDS_CONFIRMATION = 'address_needs_confirmation'
+ ADDRESS_DESIGNATED = 'address_designated' # noqa: E221
+ ADDRESS_NEEDS_CONFIRMATION = 'address_needs_confirmation' # noqa: E221
EMAIL_TYPES = [ADDRESS_DESIGNATED, ADDRESS_NEEDS_CONFIRMATION]
DEFAULT_ADDRESS_DESIGNATED_SUBJECT = "This address designated as the %(rel_desc)s for %(library)s"
DEFAULT_ADDRESS_NEEDS_CONFIRMATION_SUBJECT = "Confirm the %(rel_desc)s for %(library)s"
- DEFAULT_ADDRESS_DESIGNATED_TEMPLATE = """This email address, %(to_address)s, has been registered with the Library Simplified library registry as the %(rel_desc)s for the library %(library)s (%(library_web_url)s).
-
-If this is obviously wrong (for instance, you don't work at a public library), please accept our apologies and contact the Library Simplified support address at %(from_address)s -- something has gone wrong.
-
-If you do work at a public library, but you're not sure what this means, please speak to a technical point of contact at your library, or contact the Library Simplified support address at %(from_address)s."""
-
- NEEDS_CONFIRMATION_ADDITION = """If you do know what this means, you should also know that you're not quite done. We need to confirm that you actually meant to use this email address for this purpose. If everything looks right, please visit this link:
-
-%(confirmation_link)s
-
-The link will expire in about a day. If the link expires, just re-register your library with the library registry, and a fresh confirmation email like this will be sent out."""
+ DEFAULT_ADDRESS_DESIGNATED_TEMPLATE = (
+ "This email address, %(to_address)s, has been registered with the Library Simplified library registry "
+ "as the %(rel_desc)s for the library %(library)s (%(library_web_url)s)."
+ "\n\n"
+ "If this is obviously wrong (for instance, you don't work at a public library), please accept our "
+ "apologies and contact the Library Simplified support address at %(from_address)s -- something has gone wrong."
+ "\n\n"
+ "If you do work at a public library, but you're not sure what this means, please speak to a technical point "
+ "of contact at your library, or contact the Library Simplified support address at %(from_address)s."
+ )
+
+ NEEDS_CONFIRMATION_ADDITION = (
+ "If you do know what this means, you should also know that you're not quite done. We need to confirm that "
+ "you actually meant to use this email address for this purpose. If everything looks right, please "
+ "visit this link:"
+ "\n\n"
+ "%(confirmation_link)s"
+ "\n\n"
+ "The link will expire in about a day. If the link expires, just re-register your library with the library "
+ "registry, and a fresh confirmation email like this will be sent out."
+ )
BODIES = {
- ADDRESS_DESIGNATED : DEFAULT_ADDRESS_DESIGNATED_TEMPLATE,
- ADDRESS_NEEDS_CONFIRMATION : DEFAULT_ADDRESS_DESIGNATED_TEMPLATE + "\n\n" + NEEDS_CONFIRMATION_ADDITION
+ ADDRESS_DESIGNATED: DEFAULT_ADDRESS_DESIGNATED_TEMPLATE,
+ ADDRESS_NEEDS_CONFIRMATION: DEFAULT_ADDRESS_DESIGNATED_TEMPLATE + "\n\n" + NEEDS_CONFIRMATION_ADDITION
}
SUBJECTS = {
ADDRESS_DESIGNATED: DEFAULT_ADDRESS_DESIGNATED_SUBJECT,
- ADDRESS_NEEDS_CONFIRMATION : DEFAULT_ADDRESS_NEEDS_CONFIRMATION_SUBJECT,
+ ADDRESS_NEEDS_CONFIRMATION: DEFAULT_ADDRESS_NEEDS_CONFIRMATION_SUBJECT,
}
# We use this to catch templates that contain variables we won't
@@ -70,6 +76,73 @@ class Emailer(object):
'from_address',
]
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
+ def __init__(self, smtp_username, smtp_password, smtp_host, smtp_port, from_name, from_address, templates):
+ config_errors = []
+ required_parameters = ('smtp_username', 'smtp_password', 'smtp_host', 'smtp_port', 'from_name', 'from_address')
+ for param_name in required_parameters:
+ if not locals()[param_name]:
+ config_errors.append(param_name)
+
+ if config_errors:
+ msg = "Emailer instantiated with missing params: " + ", ".join(config_errors)
+ raise CannotLoadConfiguration(msg)
+
+ self.smtp_username = smtp_username
+ self.smtp_password = smtp_password
+ self.smtp_host = smtp_host
+ self.smtp_port = smtp_port
+ self.from_name = from_name
+ self.from_address = from_address
+ self.templates = templates
+
+ # Make sure the templates don't contain any template values we can't handle.
+ test_template_values = dict(
+ (key, "value") for key in self.KNOWN_TEMPLATE_KEYS
+ )
+ for template in list(self.templates.values()):
+ try:
+ template.body("from address", "to address", **test_template_values)
+ except Exception as e:
+ m = f"Template '{template.subject_template}'/'{template.body_template}' contains unrecognized key: {e}"
+ raise CannotLoadConfiguration(m)
+
+ def send(self, email_type, to_address, smtp=None, **kwargs):
+ """Generate an email from a template and send it.
+
+ :param email_type: The name of the template to use.
+ :param to_address: Addressee of the email.
+ :param smtp: Use this object as a mock instead of creating an
+ smtplib.SMTP object.
+ :param kwargs: Arguments to use when generating the email from
+ a template.
+ """
+ if email_type not in self.templates:
+ raise ValueError("No such email template: %s" % email_type)
+ template = self.templates[email_type]
+ from_header = '%s <%s>' % (self.from_name, self.from_address)
+ kwargs['from_address'] = self.from_address
+ kwargs['to_address'] = to_address
+ body = template.body(from_header, to_address, **kwargs)
+
+ try:
+ self._send_email(to_address, body, smtp)
+ except Exception as exc:
+ raise CannotSendEmail(exc)
+
+ ##### Private Methods #################################################### # noqa: E266
+ def _send_email(self, to_address, body, smtp=None):
+ """Actually send an email."""
+ smtp = smtp or smtplib.SMTP()
+ smtp.connect(self.smtp_host, self.smtp_port)
+ smtp.starttls()
+ smtp.login(self.smtp_username, self.smtp_password)
+ smtp.sendmail(self.from_address, to_address, body)
+ smtp.quit()
+
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+
+ ##### Class Methods ###################################################### # noqa: E266
@classmethod
def from_sitewide_integration(cls, _db):
"""Create an Emailer from a site-wide email integration.
@@ -101,12 +174,13 @@ def from_sitewide_integration(cls, _db):
from_address=from_address,
templates=email_templates)
+ ##### Private Class Methods ############################################## # noqa: E266
@classmethod
def _sitewide_integration(cls, _db):
"""Find the ExternalIntegration for the emailer."""
from model import ExternalIntegration
qu = _db.query(ExternalIntegration).filter(
- ExternalIntegration.goal==cls.GOAL
+ ExternalIntegration.goal == cls.GOAL
)
integrations = qu.all()
if not integrations:
@@ -125,85 +199,19 @@ def _sitewide_integration(cls, _db):
[integration] = integrations
return integration
- def __init__(self, smtp_username, smtp_password, smtp_host, smtp_port,
- from_name, from_address, templates):
- """Constructor."""
- if not smtp_username:
- raise CannotLoadConfiguration("No SMTP username specified")
- self.smtp_username = smtp_username
- if not smtp_password:
- raise CannotLoadConfiguration("No SMTP password specified")
- self.smtp_password = smtp_password
- if not smtp_host:
- raise CannotLoadConfiguration("No SMTP host specified")
- self.smtp_host = smtp_host
- if not smtp_port:
- raise CannotLoadConfiguration("No SMTP port specified")
- self.smtp_port = smtp_port
- if not from_name:
- raise CannotLoadConfiguration("No From: name specified")
- if not from_address:
- raise CannotLoadConfiguration("No From: address specified")
- self.from_name = from_name
- self.from_address = from_address
- self.templates = templates
-
- # Make sure the templates don't contain any template values we
- # can't handle.
- test_template_values = dict(
- (key, "value") for key in self.KNOWN_TEMPLATE_KEYS
- )
- for template in list(self.templates.values()):
- try:
- test_body = template.body(
- "from address", "to address", **test_template_values
- )
- except Exception as e:
- raise CannotLoadConfiguration(
- "Template %r/%r contains unrecognized key: %r" % (
- template.subject_template, template.body_template, e
- )
- )
-
-
- def send(self, email_type, to_address, smtp=None, **kwargs):
- """Generate an email from a template and send it.
- :param email_type: The name of the template to use.
- :param to_address: Addressee of the email.
- :param smtp: Use this object as a mock instead of creating an
- smtplib.SMTP object.
- :param kwargs: Arguments to use when generating the email from
- a template.
- """
- if not email_type in self.templates:
- raise ValueError("No such email template: %s" % email_type)
- template = self.templates[email_type]
- from_header = '%s <%s>' % (self.from_name, self.from_address)
- kwargs['from_address'] = self.from_address
- kwargs['to_address'] = to_address
- body = template.body(from_header, to_address, **kwargs)
- return self._send_email(to_address, body, smtp)
-
- def _send_email(self, to_address, body, smtp=None):
- """Actually send an email."""
- smtp = smtp or smtplib.SMTP()
- smtp.connect(self.smtp_host, self.smtp_port)
- smtp.starttls()
- smtp.login(self.smtp_username, self.smtp_password)
- smtp.sendmail(self.from_address, to_address, body)
- smtp.quit()
-
-
-class EmailTemplate(object):
+class EmailTemplate:
"""A template for email messages."""
+ ##### Class Constants #################################################### # noqa: E266
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
def __init__(self, subject_template, body_template):
self.subject_template = subject_template
self.body_template = body_template
def body(self, from_header, to_header, **kwargs):
- """Generate the complete body of the email message, including headers.
+ """
+ Generate the complete body of the email message, including headers.
:param from_header: Originating address to use in From: header.
:param to_header: Destination address to use in To: header.
@@ -220,9 +228,19 @@ def body(self, from_header, to_header, **kwargs):
# might look like '"Name" ', but it's better than
# nothing.
for k, v in (('to_address', to_header), ('from_address', from_header)):
- if not k in kwargs:
+ if k not in kwargs:
kwargs[k] = v
+
payload = self.body_template % kwargs
text_part = MIMEText(payload, 'plain', 'utf-8')
message.attach(text_part)
+
return message.as_string()
+
+ ##### Private Methods #################################################### # noqa: E266
+
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+
+ ##### Class Methods ###################################################### # noqa: E266
+
+ ##### Private Class Methods ############################################## # noqa: E266
diff --git a/geometry_loader.py b/geometry_loader.py
index a6e1dcb0..da7abafa 100644
--- a/geometry_loader.py
+++ b/geometry_loader.py
@@ -1,31 +1,25 @@
import json
-from geoalchemy2 import Geometry
-from sqlalchemy import func
-from sqlalchemy.sql.expression import cast
-from model import (
- get_one_or_create,
- Place,
- PlaceAlias,
-)
+from model import (get_one_or_create, Place, PlaceAlias)
from util import GeometryUtility
+
class GeometryLoader(object):
- """Load Place objects from a NDJSON document like that generated by
- geojson-places-us.
- """
+ """Load Place objects from a NDJSON document like that generated by geojson-places-us"""
def __init__(self, _db):
self._db = _db
- self.places_by_external_id=dict()
+ self.places_by_external_id = {}
def load_ndjson(self, fh):
while True:
metadata = fh.readline().strip()
- if not metadata:
- # End of file.
+
+ if not metadata: # End of file
break
+
geometry = fh.readline().strip()
+
yield self.load(metadata, geometry)
def load(self, metadata, geometry):
@@ -48,7 +42,7 @@ def load(self, metadata, geometry):
place, is_new = get_one_or_create(
self._db, Place, external_id=external_id, type=type,
parent=parent,
- create_method_kwargs = dict(geometry=geometry)
+ create_method_kwargs=dict(geometry=geometry)
)
# Set these values, even the ones that were set in
diff --git a/model.py b/model.py
index 2e6edf45..8764ac2b 100644
--- a/model.py
+++ b/model.py
@@ -1,86 +1,53 @@
-from collections import defaultdict
-from config import Configuration
-from flask_babel import lazy_gettext as _
-from flask_bcrypt import (
- check_password_hash,
- generate_password_hash
-)
-import datetime
-import logging
-
-import os
-import re
import json
+import logging
import random
+import re
import string
-import uszipcode
import uuid
import warnings
-from collections import Counter
+from collections import defaultdict
+from datetime import datetime, timedelta
+
+import uszipcode
+from flask_babel import lazy_gettext as _
+from flask_bcrypt import check_password_hash, generate_password_hash
+from geoalchemy2 import Geography, Geometry
from psycopg2.extensions import adapt as sqlescape
-from sqlalchemy import (
- Binary,
- Boolean,
- Column,
- DateTime,
- Enum,
- ForeignKey,
- Index,
- Integer,
- String,
- Table,
- Unicode,
-)
-from sqlalchemy import (
- create_engine,
- exc as sa_exc,
- func,
- or_,
- UniqueConstraint,
-)
-from sqlalchemy.exc import (
- IntegrityError
-)
-from sqlalchemy.ext.declarative import (
- declarative_base
-)
-from sqlalchemy.ext.hybrid import (
- hybrid_property,
-)
-from sqlalchemy.orm import (
- aliased,
- backref,
- relationship,
- sessionmaker,
- validates,
-)
-from sqlalchemy.orm.exc import (
- NoResultFound,
- MultipleResultsFound,
-)
+from sqlalchemy import (Boolean, Column, DateTime, Enum, ForeignKey, Index,
+ Integer, String, Table, Unicode, UniqueConstraint,
+ create_engine)
+from sqlalchemy import exc as sa_exc
+from sqlalchemy import func
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.ext.hybrid import hybrid_property
+from sqlalchemy.orm import (aliased, backref, relationship, sessionmaker,
+ validates)
+from sqlalchemy.orm.exc import MultipleResultsFound
from sqlalchemy.orm.session import Session
from sqlalchemy.sql import compiler
-from sqlalchemy.sql.expression import (
- cast,
- literal_column,
- or_,
- and_,
- case,
- select,
- join,
- outerjoin,
+from sqlalchemy.sql.expression import (and_, cast, or_, select)
+
+from constants import (
+ LibraryType,
+ PLACE_CITY,
+ PLACE_COUNTY,
+ PLACE_EVERYWHERE,
+ PLACE_LIBRARY_SERVICE_AREA,
+ PLACE_NATION,
+ PLACE_POSTAL_CODE,
+ PLACE_STATE,
)
-from sqlalchemy.ext.hybrid import hybrid_property
-
-from geoalchemy2 import Geography, Geometry
-
+from config import Configuration
from emailer import Emailer
+from model_helpers import (create, generate_secret, get_one, get_one_or_create)
+from util import GeometryUtility
from util.language import LanguageCodes
-from util import (
- GeometryUtility,
-)
+from util.search import LSQuery
from util.short_client_token import ShortClientTokenTool
-from util.string_helpers import random_string
+
+DEBUG = False
+Base = declarative_base()
+
def production_session():
url = Configuration.database_url()
@@ -98,13 +65,23 @@ def production_session():
LogConfiguration.initialize(_db)
return _db
-DEBUG = False
-def generate_secret():
- """Generate a random secret."""
- return random_string(24)
+def dump_query(query):
+ dialect = query.session.bind.dialect
+ statement = query.statement
+ comp = compiler.SQLCompiler(dialect, statement)
+ comp.compile()
+ enc = dialect.encoding
+ params = {}
+ for (k, v) in comp.params.items():
+ if isinstance(v, str):
+ v = v.encode(enc)
+ params[k] = sqlescape(v)
+
+ return (comp.string.encode(enc) % params).decode(enc)
-class SessionManager(object):
+
+class SessionManager:
engine_for_url = {}
@@ -128,7 +105,6 @@ def initialize(cls, url):
Base.metadata.create_all(engine)
-
cls.engine_for_url[url] = engine
return engine, engine.connect()
@@ -147,208 +123,173 @@ def session(cls, url):
def initialize_data(cls, session):
pass
-def get_one(db, model, on_multiple='error', **kwargs):
- q = db.query(model).filter_by(**kwargs)
- try:
- return q.one()
- except MultipleResultsFound as e:
- if on_multiple == 'error':
- raise e
- elif on_multiple == 'interchangeable':
- # These records are interchangeable so we can use
- # whichever one we want.
- #
- # This may be a sign of a problem somewhere else. A
- # database-level constraint might be useful.
- q = q.limit(1)
- return q.one()
- except NoResultFound:
- return None
-def dump_query(query):
- dialect = query.session.bind.dialect
- statement = query.statement
- comp = compiler.SQLCompiler(dialect, statement)
- comp.compile()
- enc = dialect.encoding
- params = {}
- for k,v in comp.params.items():
- if isinstance(v, str):
- v = v.encode(enc)
- params[k] = sqlescape(v)
- return (comp.string.encode(enc) % params).decode(enc)
+class Library(Base):
+ """
+ A Library typically represents an OPDS server.
-def get_one_or_create(db, model, create_method='',
- create_method_kwargs=None,
- **kwargs):
- one = get_one(db, model, **kwargs)
- if one:
- return one, False
- else:
- __transaction = db.begin_nested()
- try:
- if 'on_multiple' in kwargs:
- # This kwarg is supported by get_one() but not by create().
- del kwargs['on_multiple']
- obj = create(db, model, create_method, create_method_kwargs, **kwargs)
- __transaction.commit()
- return obj
- except IntegrityError as e:
- logging.info(
- "INTEGRITY ERROR on %r %r, %r: %r", model, create_method_kwargs,
- kwargs, e)
- __transaction.rollback()
- return db.query(model).filter_by(**kwargs).one(), False
-
-def create(db, model, create_method='',
- create_method_kwargs=None,
- **kwargs):
- kwargs.update(create_method_kwargs or {})
- created = getattr(model, create_method, model)(**kwargs)
- db.add(created)
- db.flush()
- return created, True
+ Notes:
+ * Libraries generally serve everyone in a specific list of Places.
-Base = declarative_base()
+ * Libraries may also focus on a subset of the places they serve, and may restrict their
+ service to certain audiences.
-class Library(Base):
- """An entry in this table corresponds more or less to an OPDS server.
+ * Regarding the library_stage and registry_stage fields:
+ * Which stage the Library is actually in depends on the combination of
+ Library.library_stage (the source institution's opinion) and Library.registry_stage
+ (the registry's opinion).
+ * If either value is CANCELLED_STAGE, the Library is in CANCELLED_STAGE.
+ * Otherwise, if either value is TESTING_STAGE, the Library is in TESTING_STAGE.
+ * Otherwise, the Library is in PRODUCTION_STAGE.
- Libraries generally serve everyone in a specific list of
- Places. Libraries may also focus on a subset of the places they
- serve, and may restrict their service to certain audiences.
- """
- __tablename__ = 'libraries'
+ * The PLS (Public Library Surveys) ID comes from the IMLS' annual survey (it isn't
+ generated by our database). It enables us to gather data for metrics such as number of
+ covered branches and size of service population.
- id = Column(Integer, primary_key=True)
+ Library attributes/columns:
- # The official name of the library. This is not unique because
- # there are many "Springfield Public Library"s. This is nullable
- # because there's a period during initial registration where a
- # library has no name. (TODO: we might be able to change this.)
- name = Column(Unicode, index=True)
+ id - Integer primary key.
- # Human-readable explanation of who the library serves.
- description = Column(Unicode)
+ timestamp - When our record of this Library was last updated.
- # An internally generated unique URN. This is used in controller
- # URLs to identify a library. A registry will always use the same
- # URN to identify a given library, even if the library's OPDS
- # server changes.
- internal_urn = Column(
- Unicode, nullable=False, index=True, unique=True,
- default=lambda: "urn:uuid:" + str(uuid.uuid4())
- )
+ name - The official name of the Library. This is not unique because there are many
+ "Springfield Public Library"s. This is nullable because there's a period during
+ initial registration where a Library has no name.
- # The URL to the library's Authentication for OPDS document. This
- # URL may change over time as libraries move to different servers.
- # This URL is generally unique, but that's not a database
- # requirement, since a single library could potentially have two
- # registry entries.
- authentication_url = Column(Unicode, index=True)
+ description - Human-readable explanation of who the Library serves.
- # The URL to the library's OPDS server root.
- opds_url = Column(Unicode)
+ internal_urn - An internally generated unique URN. This is used in controller URLs to identify
+ a Library. A registry will always use the same URN to identify a given Library,
+ even if the Library's OPDS server changes.
- # The URL to the library's patron-facing web page.
- web_url = Column(Unicode)
+ authentication_url - The URL to the Library's Authentication for OPDS document. This URL may change
+ over time as libraries move to different servers. This URL is generally unique,
+ but that's not a database requirement, since a single Library could potentially
+ have two registry entries.
- # When our record of this library was last updated.
- timestamp = Column(DateTime, index=True,
- default=lambda: datetime.datetime.utcnow(),
- onupdate=lambda: datetime.datetime.utcnow())
+ opds_url - The URL to the Library's OPDS server root.
- # The library's logo, as a data: URI.
- logo = Column(Unicode)
+ web_url - The URL to the Library's patron-facing web page.
- # Constants for determining which stage a library is in.
- #
- # Which stage the library is actually in depends on the
- # combination of Library.library_stage (the library's opinion) and
- # Library.registry_stage (the registry's opinion).
- #
- # If either value is CANCELLED_STAGE, the library is in
- # CANCELLED_STAGE.
- #
- # Otherwise, if either value is TESTING_STAGE, the library is in
- # TESTING_STAGE.
- #
- # Otherwise, the library is in PRODUCTION_STAGE.
- TESTING_STAGE = 'testing' # Library should show up in test feed
- PRODUCTION_STAGE = 'production' # Library should show up in production feed
- CANCELLED_STAGE = 'cancelled' # Library should not show up in any feed
- stage_enum = Enum(
- TESTING_STAGE, PRODUCTION_STAGE, CANCELLED_STAGE, name='library_stage'
- )
+ logo - The Library's logo, as a data: URI.
- # The library's opinion about which stage a library should be in.
- _library_stage = Column(
- stage_enum, index=True, nullable=False, default=TESTING_STAGE,
- name="library_stage"
- )
+ library_stage - The source institution's opinion about which stage the Library should be in.
- # The registry's opinion about which stage a library should be in.
- registry_stage = Column(
- stage_enum, index=True, nullable=False, default=TESTING_STAGE
- )
+ registry_stage - The registry's opinion about which stage the Library should be in.
- # Can people get books from this library without authenticating?
- #
- # We store this specially because it might be useful to filter
- # for libraries of this type.
- anonymous_access = Column(Boolean, default=False)
+ anonymous_access - Whether people get books from this Library without authenticating. We store this
+ specially because it might be useful to filter for libraries of this type.
- # Can eligible people get credentials for this library through
- # an online registration process?
- #
- # We store this specially because it might be useful to filter
- # for libraries of this type.
- online_registration = Column(Boolean, default=False)
+ online_registration - Whether eligible people get credentials for this Library through an online
+ registration process. We store this specially because it might be useful to
+ filter for libraries of this type.
- # To issue Short Client Tokens for this library, the registry must
- # share a short name and a secret with them.
- short_name = Column(Unicode, index=True, unique=True)
+ short_name - To issue Short Client Tokens for this Library, the registry must share a
+ short name and a secret with them.
- # The shared secret is also used to authenticate requests in the
- # case where a library's URL has changed.
- shared_secret = Column(Unicode)
+ shared_secret - The shared secret is also used to authenticate requests in the case where a
+ Library's URL has changed.
- # A library may have alternate names, e.g. "BPL" for the Brooklyn
- # Public Library.
- aliases = relationship("LibraryAlias", backref='library')
+ Library model relationships:
- # A library may serve one or more geographic areas.
- service_areas = relationship('ServiceArea', backref='library')
+ aliases - Alternate names, e.g. "BPL" for the Brooklyn Public Library
- # A library may serve one or more specific audiences.
- audiences = relationship('Audience', secondary='libraries_audiences',
- back_populates="libraries")
+ service_areas - Places the Library serves
- # The registry may have information about the library's
- # collections of materials. The registry doesn't need to know
- # details, but it's useful to know approximate counts when finding
- # libraries that serve specific language communities.
- collections = relationship("CollectionSummary", backref='library')
+ audiences - Specific Audiences the Library serves
+
+ collections - The registry may have information about the library's collections
+ of materials. The registry doesn't need to know details, but it's
+ useful to know approximate counts when finding libraries that serve
+ specific language communities.
+
+ delegated_patron_identifiers - The registry may keep delegated patron identifiers (basically, Adobe
+ IDs) for a library's patrons. This allows the library's patrons to
+ decrypt Adobe ACS-encrypted books without having to license separate
+ Adobe Vendor ID and without the registry knowing anything about the patrons.
- # The registry may keep delegated patron identifiers (basically,
- # Adobe IDs) for a library's patrons. This allows the library's
- # patrons to decrypt Adobe ACS-encrypted books without having to
- # license separate Adobe Vendor ID and without the registry
- # knowing anything about the patrons.
- delegated_patron_identifiers = relationship(
- "DelegatedPatronIdentifier", backref='library'
+
+ hyperlinks - A Library may have miscellaneous URIs associated with it. Generally
+ speaking, the registry is only concerned about these URIs insofar as
+ it needs to verify that they work.
+ """
+ ##### Class Constants #################################################### # noqa: E266
+ TESTING_STAGE = 'testing' # Library should show up in test feed # noqa: E221
+ PRODUCTION_STAGE = 'production' # Library should show up in production feed # noqa: E221
+ CANCELLED_STAGE = 'cancelled' # Library should not show up in any feed # noqa: E221
+ PLS_ID = "pls_id" # Public Library Surveys ID # noqa: E221
+ WHITESPACE_REGEX = re.compile(r"\s+") # noqa: E221
+
+ SUPRALOCAL_PLACE_TYPES = (
+ PLACE_STATE,
+ PLACE_NATION,
+ PLACE_EVERYWHERE,
)
- # A library may have miscellaneous URIs associated with it. Generally
- # speaking, the registry is only concerned about these URIs insofar as
- # it needs to verify that they work.
- hyperlinks = relationship("Hyperlink", backref='library')
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
+ def set_hyperlink(self, rel, *hrefs):
+ """
+ Make sure Library has a Hyperlink with the given `rel` that points to a Resource with
+ one of the given `href`s.
+
+ If there's already a matching Hyperlink, it will be returned unmodified. Otherwise, the
+ first item in `hrefs` will be used as the basis for a new Hyperlink, or an existing
+ Hyperlink will be modified to use the first item in `hrefs` as its Resource.
+
+ :return: A 2-tuple (Hyperlink, is_modified). `is_modified`
+ is True if a new Hyperlink was created _or_ an existing
+ Hyperlink was modified.
+ """
+ if not rel:
+ raise ValueError("No link relation was specified")
+
+ if not hrefs:
+ raise ValueError("No Hyperlink hrefs were specified")
+
+ default_href = hrefs[0]
+ _db = Session.object_session(self)
+ (hyperlink, is_modified) = get_one_or_create(_db, Hyperlink, library=self, rel=rel,)
+
+ if hyperlink.href not in hrefs:
+ hyperlink.href = default_href
+ is_modified = True
+
+ return hyperlink, is_modified
+
+ ##### SQLAlchemy Table properties ######################################## # noqa: E266
+ __tablename__ = 'libraries'
+
+ ##### SQLAlchemy non-Column components ################################### # noqa: E266
+ stage_enum = Enum(TESTING_STAGE, PRODUCTION_STAGE, CANCELLED_STAGE, name='library_stage')
+
+ ##### SQLAlchemy Columns ################################################# # noqa: E266
+ id = Column(Integer, primary_key=True)
+ name = Column(Unicode, index=True)
+ description = Column(Unicode)
+ internal_urn = Column(Unicode, nullable=False, index=True, unique=True,
+ default=lambda: "urn:uuid:" + str(uuid.uuid4()))
+ authentication_url = Column(Unicode, index=True)
+ opds_url = Column(Unicode)
+ web_url = Column(Unicode)
+ timestamp = Column(DateTime, index=True, default=datetime.utcnow, onupdate=datetime.utcnow)
+ logo = Column(Unicode)
+ _library_stage = Column(stage_enum, index=True, nullable=False, default=TESTING_STAGE, name="library_stage")
+ registry_stage = Column(stage_enum, index=True, nullable=False, default=TESTING_STAGE)
+ anonymous_access = Column(Boolean, default=False)
+ online_registration = Column(Boolean, default=False)
+ short_name = Column(Unicode, index=True, unique=True)
+ shared_secret = Column(Unicode)
- # The PLS (Public Library Surveys) ID comes from the IMLS' annual survey
- # (it isn't generated by our database). It enables us to gather data for metrics
- # such as number of covered branches and size of service population.
- PLS_ID = "pls_id"
+ ##### SQLAlchemy Relationships ########################################### # noqa: E266
+ aliases = relationship("LibraryAlias", backref='library')
+ service_areas = relationship('ServiceArea', backref='library')
+ audiences = relationship('Audience', secondary='libraries_audiences', back_populates="libraries")
+ collections = relationship("CollectionSummary", backref='library')
+ delegated_patron_identifiers = relationship("DelegatedPatronIdentifier", backref='library')
+ hyperlinks = relationship("Hyperlink", backref='library')
+ settings = relationship("ConfigurationSetting", backref="library", lazy="joined", cascade="all, delete")
+ ##### SQLAlchemy Field Validation ######################################## # noqa: E266
@validates('short_name')
def validate_short_name(self, key, value):
if not value:
@@ -359,44 +300,10 @@ def validate_short_name(self, key, value):
)
return value.upper()
- @classmethod
- def for_short_name(cls, _db, short_name):
- """Look up a library by short name."""
- return get_one(_db, Library, short_name=short_name)
-
- @classmethod
- def for_urn(cls, _db, urn):
- """Look up a library by URN."""
- return get_one(_db, Library, internal_urn=urn)
-
- @classmethod
- def random_short_name(cls, duplicate_check=None, max_attempts=20):
- """Generate a random short name for a library.
-
- Library short names are six uppercase letters.
-
- :param duplicate_check: Call this function to check whether a
- generated name is a duplicate.
- :param max_attempts: Stop trying to generate a name after this
- many failures.
- """
- attempts = 0
- choice = None
- while choice is None and attempts < max_attempts:
- choice = "".join(
- [random.choice(string.ascii_uppercase)
- for i in range(6)]
- )
- if duplicate_check and duplicate_check(choice):
- choice = None
- attempts += 1
- if choice is None:
- # This is very bad, but it's better to raise an exception
- # than to be stuck in an infinite loop.
- raise ValueError(
- "Could not generate random short name after %d attempts!" % attempts
- )
- return choice
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+ @property
+ def pls_id(self):
+ return ConfigurationSetting.for_library(Library.PLS_ID, self)
@hybrid_property
def library_stage(self):
@@ -404,64 +311,68 @@ def library_stage(self):
@library_stage.setter
def library_stage(self, value):
- """A library can't unilaterally go from being in production to
- not being in production.
- """
+ """A library can't unilaterally go from being in production to not being in production"""
if self.in_production and value != self.PRODUCTION_STAGE:
- raise ValueError(
- "This library is already in production; only the registry can take it out of production."
- )
- self._library_stage = value
+ msg = "This library is already in production; only the registry can take it out of production."
+ raise ValueError(msg)
- @property
- def pls_id(self):
- return ConfigurationSetting.for_library(Library.PLS_ID, self)
+ self._library_stage = value
@property
def number_of_patrons(self):
db = Session.object_session(self)
- # This is only meaningful if the library is in production.
+
if not self.in_production:
- return 0
+ return 0 # Count is only meaningful if the library is in production
+
query = db.query(DelegatedPatronIdentifier).filter(
- DelegatedPatronIdentifier.type==DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID,
- DelegatedPatronIdentifier.library_id==self.id
+ DelegatedPatronIdentifier.type == DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID,
+ DelegatedPatronIdentifier.library_id == self.id
)
+
return query.count()
@property
def in_production(self):
- """Is this library in production?
+ """Is this library in production? If library and registry agree on production, it is."""
+ return bool(self.library_stage == self.PRODUCTION_STAGE and self.registry_stage == self.PRODUCTION_STAGE)
- If both the library and the registry think it should be, it is.
+ @property
+ def types(self):
"""
- prod = self.PRODUCTION_STAGE
- return self.library_stage == prod and self.registry_stage == prod
+ Return any special types for this library.
- @property
- def service_area_name(self):
- """Describe the library's service area in a short string a human would
- understand, e.g. "Kern County, CA".
+ :yield: A sequence of code constants from LibraryTypes.
+ """
+ service_area = self.service_area
+ if not service_area:
+ return
- This library does the best it can to express a library's service
- area as the name of a single place, but it's not always possible
- since libraries can have multiple service areas.
+ code = service_area.library_type
- TODO: We'll want to fetch a library's ServiceAreas (and their
- Places) as part of the query that fetches libraries, so that
- this doesn't result in extra DB queries per library.
+ if code:
+ yield code
- :return: A string, or None if the library's service area can't be
- described as a short string.
+ # TODO: in the future, more types, e.g. audience-based, can go here.
+
+ @property
+ def service_area(self):
+ """Return the service area of this Library, assuming there is only
+ one.
+ :return: A Place, if there is one well-defined place this
+ library serves; otherwise None.
"""
+ everywhere = None
+
# Group the ServiceAreas by type.
by_type = defaultdict(set)
for a in self.service_areas:
if not a.place:
continue
if a.place.type == Place.EVERYWHERE:
- # We already know that 'everywhere' won't work. Ignore
- # it so it doesn't mask something more specific.
+ # We will only return 'everywhere' if we don't find
+ # something more specific.
+ everywhere = a.place
continue
by_type[a.type].add(a)
@@ -471,321 +382,182 @@ def service_area_name(self):
for area_type in ServiceArea.FOCUS, ServiceArea.ELIGIBILITY:
if len(by_type[area_type]) == 1:
[service_area] = by_type[area_type]
- break
+ if service_area.place:
+ return service_area.place
- if service_area:
- return service_area.place.human_friendly_name
+ # This library serves everywhere, and it doesn't _also_ serve
+ # some more specific place.
+ if everywhere:
+ return everywhere
- # This library does not have one ServiceArea that stands out,
- # so we can't describe its service area with a short string.
- return None
-
- @classmethod
- def _feed_restriction(cls, production, library_field=None, registry_field=None):
- """Create a SQLAlchemy restriction that only finds libraries that
- ought to be in the given feed.
-
- :param production: A boolean. If True, then only libraries in
- the production stage should be included. If False, then
- libraries in the production or testing stages should be
- included.
-
- :return: A SQLAlchemy expression.
- """
- # The library's opinion
- if library_field is None:
- library_field = Library.library_stage
- # The registry's opinion
- if registry_field is None:
- registry_field = Library.registry_stage
+ # This library does not have one ServiceArea that stands out.
+ return None
- prod = cls.PRODUCTION_STAGE
- test = cls.TESTING_STAGE
+ @property
+ def service_area_name(self):
+ """Describe the library's service area in a short string a human would
+ understand, e.g. "Kern County, CA".
- if production:
- # Both parties must agree that this library is
- # production-ready.
- return and_(library_field==prod, registry_field==prod)
- else:
- # Both parties must agree that this library is _either_
- # in the production stage or the testing stage.
- return and_(
- library_field.in_((prod, test)),
- registry_field.in_((prod, test))
- )
+ This library does the best it can to express a library's service
+ area as the name of a single place, but it's not always possible
+ since libraries can have multiple service areas.
- @classmethod
- def relevant(cls, _db, target, language, audiences=None, production=True):
- """Find libraries that are most relevant for a user.
-
- :param target: The user's current location. May be a Geometry object or
- a 2-tuple (latitude, longitude).
- :param language: The ISO 639-1 code for the user's language.
- :param audiences: List of audiences the user is a member of.
- By default, only libraries with the PUBLIC audience are shown.
- :param production: If True, only libraries that are ready for
- production are shown.
+ TODO: We'll want to fetch a library's ServiceAreas (and their
+ Places) as part of the query that fetches libraries, so that
+ this doesn't result in extra DB queries per library.
- :return A Counter mapping Library objects to scores.
+ :return: A string, or None if the library's service area can't be
+ described as a short string.
"""
+ if self.service_area:
+ return self.service_area.human_friendly_name
+ return None
- # Constants that determine the weights of different components of the score.
- # These may need to be adjusted when there are more libraries in the system to
- # test with.
- base_score = 1
- audience_factor = 1.01
- collection_size_factor = 1000
- focus_area_distance_factor = 0.005
- eligibility_area_distance_factor = 0.1
- focus_area_size_factor = 0.00000001
- score_threshold = 0.00001
-
- # By default, only show libraries that are for the general public.
- audiences = audiences or [Audience.PUBLIC]
-
- # Convert the target to a single point.
- if isinstance(target, tuple):
- target = GeometryUtility.point(*target)
-
- # Convert the language to 3-letter code.
- language_code = LanguageCodes.string_to_alpha_3(language)
+ ##### Class Methods ###################################################### # noqa: E266
+ @classmethod
+ def for_short_name(cls, _db, short_name):
+ """Look up a library by short name."""
+ return get_one(_db, Library, short_name=short_name)
- # Set up an alias for libraries and collection summaries for use in subqueries.
- libraries_collections = outerjoin(
- Library, CollectionSummary,
- Library.id==CollectionSummary.library_id
- ).alias("libraries_collections")
+ @classmethod
+ def for_urn(cls, _db, urn):
+ """Look up a library by URN."""
+ return get_one(_db, Library, internal_urn=urn)
- # Check if each library has a public audience.
- public_audiences_subquery = select(
- [func.count()]
- ).where(
- and_(
- Audience.name==Audience.PUBLIC,
- libraries_audiences.c.library_id==libraries_collections.c.libraries_id,
- )
- ).select_from(
- libraries_audiences.join(Audience)
- ).lateral("public_audiences")
+ @classmethod
+ def random_short_name(cls, duplicate_check=None, max_attempts=20):
+ """Generate a random short name for a library.
- # Check if each library has a non-public audience from
- # the user's audiences.
- non_public_audiences_subquery = select(
- [func.count()]
- ).where(
- and_(
- Audience.name!=Audience.PUBLIC,
- Audience.name.in_(audiences),
- libraries_audiences.c.library_id==libraries_collections.c.libraries_id,
- )
- ).select_from(
- libraries_audiences.join(Audience)
- ).lateral("non_public_audiences")
+ Library short names are six uppercase letters.
- # Increase the score if there was an audience match other than
- # public, and set it to 0 if there's no match at all.
- score = case(
- [
- # Audience match other than public.
- (non_public_audiences_subquery!=literal_column(str(0)),
- literal_column(str(base_score * audience_factor))),
- # Public audience.
- (public_audiences_subquery!=literal_column(str(0)),
- literal_column(str(base_score)))
- ],
- # No match.
- else_=literal_column(str(0)),
- )
+ :param duplicate_check: Call this function to check whether a
+ generated name is a duplicate.
+ :param max_attempts: Stop trying to generate a name after this
+ many failures.
+ """
+ attempts = 0
+ choice = None
+ while not choice and attempts < max_attempts:
+ choice = "".join([random.choice(string.ascii_uppercase) for i in range(6)])
- # Function that decreases exponentially as its input increases.
- def exponential_decrease(value):
- original_exponent = -1 * value
- # Prevent underflow and overflow errors by ensuring
- # the exponent is between -500 and 500.
- exponent = case(
- [(original_exponent > 500, literal_column(str(500))),
- (original_exponent < -500, literal_column(str(-500)))],
- else_=original_exponent)
- return func.exp(exponent)
-
- # Get the maximum collection size for the user's language.
- collections_by_size = _db.query(CollectionSummary).filter(
- CollectionSummary.language==language_code).order_by(
- CollectionSummary.size.desc())
-
- if collections_by_size.count() == 0:
- max = 0
- else:
- max = collections_by_size.first().size
-
- # Only take collection size into account in the ranking if there's at
- # least one library with a non-empty collection in the user's language.
- if max > 0:
- # If we don't have any information about a library's collection size,
- # we'll just say there's one book. That way the library is ranked above
- # a library we know has 0 books, but below any libraries with more.
- # Maybe this should be larger, or should consider languages other than
- # the user's language.
- estimated_size = case(
- [(libraries_collections.c.collectionsummaries_id==None, literal_column("1"))],
- else_=libraries_collections.c.collectionsummaries_size
- )
- score_multiplier = (1 - exponential_decrease(1.0 * collection_size_factor * estimated_size / max))
- score = score * score_multiplier
-
- # Create a subquery for a type of service area.
- def service_area_subquery(type):
- return select(
- [Place.geometry, Place.type]
- ).where(
- and_(
- ServiceArea.library_id==libraries_collections.c.libraries_id,
- ServiceArea.type==type,
- )
- ).select_from(
- join(
- ServiceArea, Place,
- ServiceArea.place_id==Place.id
- )
- ).lateral()
-
- # Find each library's eligibility areas.
- eligibility_areas_subquery = service_area_subquery(ServiceArea.ELIGIBILITY)
-
- # Find each library's focus areas.
- focus_areas_subquery = service_area_subquery(ServiceArea.FOCUS)
-
- # Get the minimum distance from the target to any service area returned
- # by the subquery, in km. If a service area is "everywhere", the distance
- # is 0.
- def min_distance(subquery):
- return func.min(
- case(
- [(subquery.c.type==Place.EVERYWHERE, literal_column(str(0)))],
- else_=func.ST_DistanceSphere(target, subquery.c.geometry)
- )
- ) / 1000
+ if callable(duplicate_check) and duplicate_check(choice):
+ choice = None
- # Minimum distance to any eligibility area.
- eligibility_min_distance = min_distance(eligibility_areas_subquery)
+ attempts += 1
- # Minimum distance to any focus area.
- focus_min_distance = min_distance(focus_areas_subquery)
+ if choice is None: # Something's wrong, need to raise an exception.
+ raise ValueError(f"Could not generate random short name after {attempts} attempts!")
- # Decrease the score based on how far away the library's eligibility area is.
- score = score * exponential_decrease(1.0 * eligibility_area_distance_factor * eligibility_min_distance)
+ return choice
- # Decrease the score based on how far away the library's focus area is.
- score = score * exponential_decrease(1.0 * focus_area_distance_factor * focus_min_distance)
+ @classmethod
+ def nearby(cls, db_session, target, max_radius=150, production=True):
+ """
+ Return an SQLAlchemy Query object representing a search for all Libraries
+ with ServiceArea Places whose geometric representations are fully or
+ partially inside a circle of a given radius.
+
+ IMPORTANT! If you are editing this function, you have to be very careful
+ about the difference between PostGIS Geometry and Geography data types.
+ Many PostGIS functions can take either Geometry or Geography arguments,
+ but change their behavior and return value based on the type provided.
+
+ For background, look at chapters 9 (Geometries) and 11 (Geographies) here:
+
+ http://postgis.net/workshops/postgis-intro/index.html
+
+ The TL;DR:
+ * A Geometry is fundamentally Cartesian, and describes positions on
+ a plane. Sort of. Except when the Spatial Reference Identifier (SRID)
+ has native units which are are radian based, as with SRID 4326.
+ * A Geography is fundamentally non-Euclidean, and describes positions
+ on a globe, which may be a spheroid whose deformation is indicated
+ by the SRID of the data, or a sphere for faster calculations.
+ * It's kind of ridiculously complicated. Tread with caution and use
+ comprehensive unit tests, because the errors are often tricky to catch.
+
+ Notes:
+ * Results will be sorted in ascending distance order
+ * Distances are calculated from the supplied point target to the nearest
+ edge or vertex of the Place geometry
+ * Distances are returned in meters
+
+ params:
+ target - a util.geo.Location object
+ max_radius - search radius in kilometers
+ """
+ # Step 1: Establish a localized value for the search radius, in radians.
+ # Latitude and longitude are angle measures, so we need to work
+ # in radians. Because lat/long describe points on a non-cartesian
+ # surface, the number of kilometers a radian describes is different
+ # as you move north and south, since lines of longitude converge
+ # at the poles.
+ radius_in_meters = max_radius * 1000.0 # noqa: E221
+ northeast_angle = func.radians(45.0) # noqa: E221 # Radian angle from north (0), clockwise
+ target_geometry = cast(target.ewkt, Geometry) # noqa: E221 # ST_Distance wants a geometry
+ target_geography = cast(target.ewkt, Geography) # noqa: E221 # ST_Project wants a geography
+ northeast_ref_pt = func.ST_Project(target_geography, radius_in_meters, northeast_angle) # noqa: E221
+ ne_ref_pt_geom = cast(northeast_ref_pt, Geometry) # noqa: E221
+
+ # This MUST have two Geometry parameters. If it uses Geography the distance returned
+ # will be in meters, NOT radians.
+ local_dist_in_rads = func.ST_Distance(target_geometry, ne_ref_pt_geom)
+
+ # Step 2: Use the localized value to set up a geometry-based radius function
+ # that's locally accurate (for rough values of 'accurate'). This will
+ # let us limit our search to Places no further than max_radius km from
+ # our target location.
+ within_max_radius = func.ST_DWithin(target_geometry, Place.geometry, local_dist_in_rads)
+
+ # Step 3: Set up a function to find the minimum distance between the
+ # target (a point), and an edge of the Place objects we want
+ # to search, which are typically polygons. We won't restrict
+ # the query on this, but we do want to return it as a column,
+ # and use it to order results.
+ meters_to_near_edge = func.min(func.ST_DistanceSphere(target_geometry, Place.geometry))
+
+ # Step 4: Establish the query object, and restrict it to the right feed.
+ # We only want to search against the geometry of Place objects which
+ # are used as the service area of one or more Libraries, to avoid
+ # searching against all Places loaded in the database, so we join
+ # Library -> ServiceArea -> Place.
+ query_obj = db_session.query(Library).join(Library.service_areas).join(ServiceArea.place)
+ query_obj = query_obj.filter(cls._feed_restriction(production))
+
+ # Step 5: Use our radius function to add a WHERE clause, so that we return
+ # only Library objects within the max_radius in km.
+ query_obj = query_obj.filter(within_max_radius)
+
+ # Step 6: Add the distance from our target point to the near edge as a
+ # column in the output, group our results by Library, and then
+ # use the point-to-polygon-edge distance to order our result set.
+ query_obj = query_obj.add_columns(meters_to_near_edge)
+ query_obj = query_obj.group_by(Library.id)
+ query_obj = query_obj.order_by(meters_to_near_edge.asc())
+
+ return query_obj
- # Decrease the score based on the sum of the sizes of the library's focus areas, in km^2.
- # This currently assumes that the library's focus areas don't overlap, which may not be true.
- # If a focus area is "everywhere", the size is the area of Earth (510 million km^2).
- focus_area_size = func.sum(
- case(
- [(focus_areas_subquery.c.type==Place.EVERYWHERE, literal_column(str(510000000000000)))],
- else_=func.ST_Area(focus_areas_subquery.c.geometry)
- )
- ) / 1000000
- score = score * exponential_decrease(1.0 * focus_area_size_factor * focus_area_size)
-
- # Rank the libraries by score, and remove any libraries
- # that are below the score threshold.
- library_id_and_score = select(
- [libraries_collections.c.libraries_id,
- score.label("score"),
- ]
- ).having(
- score > literal_column(str(score_threshold))
- ).where(
- and_(
- # Query for either the production feed or the testing feed.
- cls._feed_restriction(
- production,
- libraries_collections.c.libraries_library_stage,
- libraries_collections.c.libraries_registry_stage
- ),
-
- # Limit to the collection summaries for the user's
- # language. If a library has no collection for the
- # language, it's still included.
- or_(
- libraries_collections.c.collectionsummaries_language==language_code,
- libraries_collections.c.collectionsummaries_language==None
- )
- )
- ).select_from(
- libraries_collections
- ).group_by(
- libraries_collections.c.libraries_id,
- libraries_collections.c.collectionsummaries_id,
- libraries_collections.c.collectionsummaries_size,
- ).order_by(
- score.desc()
- )
+ @classmethod
+ def nearest_by_types(cls, db_session, target, place_types, max_radius=150, production=True):
+ """Return Libraries within max_radius, filtered by a list of place types"""
+ return cls.nearby(db_session, target, max_radius, production).filter(Place.type.in_(place_types))
- result = _db.execute(library_id_and_score)
- library_ids_and_scores = {r[0]: r[1] for r in result}
- # Look up the Library objects and return them with the scores.
- libraries = _db.query(Library).filter(Library.id.in_(list(library_ids_and_scores.keys())))
- c = Counter()
- for library in libraries:
- c[library] = library_ids_and_scores[library.id]
- return c
+ @classmethod
+ def nearest_supralocals(cls, db_session, target, max_radius=500, production=True):
+ """
+ Find the nearest 'supralocal' Libraries, where supralocal means a Library with a
+ service area whose place type is one of Place.STATE, Place.NATION, or Place.EVERYWHERE.
+ """
+ return cls.nearest_by_types(db_session=db_session, target=target,
+ place_types=cls.SUPRALOCAL_PLACE_TYPES,
+ max_radius=max_radius, production=production)
@classmethod
- def nearby(cls, _db, target, max_radius=150, production=True):
- """Find libraries whose service areas include or are close to the
- given point.
-
- :param target: The starting point. May be a Geometry object or
- a 2-tuple (latitude, longitude).
- :param max_radius: How far out from the starting point to search
- for a library's service area, in kilometers.
- :param production: If True, only libraries that are ready for
- production are shown.
+ def search_new(cls, db_session, query_string, location=None, production=True):
+ sq_obj = LSQuery(query_string)
- :return: A database query that returns lists of 2-tuples
- (library, distance from starting point). Distances are
- measured in meters.
- """
- # We start with a single point on the globe. Call this Point
- # A.
- if isinstance(target, tuple):
- target = GeometryUtility.point(*target)
- target_geography = cast(target, Geography)
-
- # Find another point on the globe that's 150 kilometers
- # northeast of Point A. Call this Point B.
- other_point = func.ST_Project(
- target_geography, max_radius*1000, func.radians(90.0)
- )
- other_point = cast(other_point, Geometry)
-
- # Determine the distance between Point A and Point B, in
- # radians. (150 kilometers is a different number of radians in
- # different parts of the world.)
- distance_to_other_point = func.ST_Distance(target, other_point)
-
- # Find all Places that are no further away from A than that
- # number of radians.
- nearby = func.ST_DWithin(target,
- Place.geometry,
- distance_to_other_point)
-
- # For each library served by such a place, calculate the
- # minimum distance between the library's service area and
- # Point A in meters.
- min_distance = func.min(func.ST_DistanceSphere(target, Place.geometry))
-
- qu = _db.query(Library).join(Library.service_areas).join(
- ServiceArea.place)
- qu = qu.filter(cls._feed_restriction(production))
- qu = qu.filter(nearby)
- qu = qu.add_columns(
- min_distance).group_by(Library.id).order_by(
- min_distance.asc())
- return qu
+ if not sq_obj and not location:
+ return [] # We don't have a valid search or a known user location, nothing to do
@classmethod
def search(cls, _db, target, query, production=True):
@@ -809,8 +581,7 @@ def search(cls, _db, target, query, production=True):
max_libraries = 10
if not query:
- # No query, no results.
- return []
+ return [] # No query, no results.
if target:
if isinstance(target, tuple):
here = GeometryUtility.point(*target)
@@ -823,8 +594,8 @@ def search(cls, _db, target, query, production=True):
# We start with libraries that match the name query.
if library_query:
libraries_for_name = cls.search_by_library_name(
- _db, library_query, here, production).limit(
- max_libraries).all()
+ _db, library_query, here, production
+ ).limit(max_libraries).all()
else:
libraries_for_name = []
@@ -839,9 +610,7 @@ def search(cls, _db, target, query, production=True):
if libraries_for_name and libraries_for_location:
# Filter out any libraries that show up in both lists.
for_name = set(libraries_for_name)
- libraries_for_location = [
- x for x in libraries_for_location if not x in for_name
- ]
+ libraries_for_location = [x for x in libraries_for_location if x not in for_name]
# A lot of libraries list their locations only within their description, so it's worth
# checking the description for the search term.
@@ -866,10 +635,9 @@ def search_by_library_name(cls, _db, name, here=None, production=True):
return cls.create_query(_db, here, production, name_matches, alias_matches, partial_matches)
@classmethod
- def search_by_location_name(cls, _db, query, type=None, here=None,
- production=True):
- """Find libraries whose service area overlaps a place with
- the given name.
+ def search_by_location_name(cls, _db, query, type=None, here=None, production=True):
+ """
+ Find libraries whose service area overlaps a place with the given name.
:param query: Name of the place to search for.
:param type: Restrict results to places of this type.
@@ -886,22 +654,22 @@ def search_by_location_name(cls, _db, query, type=None, here=None,
named_place,
func.ST_Intersects(Place.geometry, named_place.geometry)
).outerjoin(named_place.aliases)
+
qu = qu.filter(cls._feed_restriction(production))
name_match = cls.fuzzy_match(named_place.external_name, query)
alias_match = cls.fuzzy_match(PlaceAlias.name, query)
qu = qu.filter(or_(name_match, alias_match))
+
if type:
- qu = qu.filter(named_place.type==type)
+ qu = qu.filter(named_place.type == type)
+
if here:
min_distance = func.min(func.ST_DistanceSphere(here, named_place.geometry))
qu = qu.add_columns(min_distance)
qu = qu.group_by(Library.id)
qu = qu.order_by(min_distance.asc())
- return qu
- us_zip = re.compile("^[0-9]{5}$")
- us_zip_plus_4 = re.compile("^[0-9]{5}-[0-9]{4}$")
- running_whitespace = re.compile(r"\s+")
+ return qu
@classmethod
def create_query(cls, _db, here=None, production=True, *args):
@@ -913,9 +681,7 @@ def create_query(cls, _db, here=None, production=True, *args):
if here:
# Order by the minimum distance between one of the
# library's service areas and the current location.
- min_distance = func.min(
- func.ST_DistanceSphere(here, Place.geometry)
- )
+ min_distance = func.min(func.ST_DistanceSphere(here, Place.geometry))
qu = qu.add_columns(min_distance)
qu = qu.group_by(Library.id)
qu = qu.order_by(min_distance.asc())
@@ -938,21 +704,10 @@ def search_within_description(cls, _db, query, here=None, production=True):
def query_cleanup(cls, query):
"""Clean up a query."""
query = query.lower()
- query = cls.running_whitespace.sub(" ", query).strip()
-
- # Correct the most common misspelling of 'library'.
- query = query.replace("libary", "library")
+ query = cls.WHITESPACE_REGEX.sub(" ", query).strip()
+ query = query.replace("libary", "library") # Correct the most common misspelling of 'library'
return query
- @classmethod
- def as_postal_code(cls, query):
- """Try to interpret a query as a postal code."""
- if cls.us_zip.match(query):
- return query
- match = cls.us_zip_plus_4.match(query)
- if match:
- return query[:5]
-
@classmethod
def query_parts(cls, query):
"""Turn a query received by a user into a set of things to
@@ -1011,42 +766,74 @@ def partial_match(cls, field, value):
just one word of a library's name--against the given field."""
return field.ilike("%{}%".format(value))
- def set_hyperlink(self, rel, *hrefs):
- """Make sure this library has a Hyperlink with the given `rel` that
- points to a Resource with one of the given `href`s.
-
- If there's already a matching Hyperlink, it will be returned
- unmodified. Otherwise, the first item in `hrefs` will be used
- as the basis for a new Hyperlink, or an existing Hyperlink
- will be modified to use the first item in `hrefs` as its
- Resource.
+ @classmethod
+ def get_hyperlink(cls, library, rel):
+ link = [x for x in library.hyperlinks if x.rel == rel]
+ if len(link) > 0:
+ return link[0]
- :return: A 2-tuple (Hyperlink, is_modified). `is_modified`
- is True if a new Hyperlink was created _or_ an existing
- Hyperlink was modified.
+ @classmethod
+ def patron_counts_by_library(self, _db, libraries):
+ """Determine the number of registered Adobe Account IDs
+ (~patrons) for each of the given libraries.
+ :param _db: A database connection.
+ :param libraries: A list of Library objects.
+ :return: A dictionary mapping library IDs to patron counts.
"""
- if not rel:
- raise ValueError("No link relation was specified")
- if not hrefs:
- raise ValueError("No Hyperlink hrefs were specified")
- default_href = hrefs[0]
- _db = Session.object_session(self)
- hyperlink, is_modified = get_one_or_create(
- _db, Hyperlink, library=self, rel=rel,
+ # The concept of 'patron count' only makes sense for production libraries.
+ library_ids = [lib.id for lib in libraries if lib.in_production]
+
+ # Run the SQL query.
+ counts = select(
+ [
+ DelegatedPatronIdentifier.library_id,
+ func.count(DelegatedPatronIdentifier.id)
+ ],
+ ).where(
+ and_(DelegatedPatronIdentifier.type == DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID,
+ DelegatedPatronIdentifier.library_id.in_(library_ids))
+ ).group_by(
+ DelegatedPatronIdentifier.library_id
+ ).select_from(
+ DelegatedPatronIdentifier
)
+ rows = _db.execute(counts)
- if hyperlink.href not in hrefs:
- hyperlink.href = default_href
- is_modified = True
+ # Convert the results to a dictionary.
+ results = dict()
+ for (library_id, count) in rows:
+ results[library_id] = count
- return hyperlink, is_modified
+ return results
+ ##### Private Class Methods ############################################## # noqa: E266
@classmethod
- def get_hyperlink(cls, library, rel):
- link = [x for x in library.hyperlinks if x.rel == rel]
- if len(link) > 0:
- return link[0]
+ def _feed_restriction(cls, production, library_field=None, registry_field=None):
+ """
+ Create a SQLAlchemy restriction that only finds libraries that ought to be in the given feed.
+
+ :param production: A boolean. If True, then only libraries in
+ the production stage should be included. If False, then
+ libraries in the production or testing stages should be
+ included.
+
+ :return: A SQLAlchemy expression.
+ """
+ if library_field is None:
+ library_field = Library.library_stage # The library's opinion
+
+ if registry_field is None:
+ registry_field = Library.registry_stage # The registry's opinion
+
+ prod = cls.PRODUCTION_STAGE
+ test = cls.TESTING_STAGE
+
+ if production: # Both parties must agree that this library is production-ready
+ return and_(library_field == prod, registry_field == prod)
+ else: # Both must agree library is in _either_ prod stage or test stage
+ return and_(library_field.in_((prod, test)), registry_field.in_((prod, test)))
+
class LibraryAlias(Base):
@@ -1080,300 +867,122 @@ class ServiceArea(Base):
Integer, ForeignKey('places.id'), index=True
)
- # A library may have a ServiceArea because people in that area are
- # eligible for service, or because the library specifically
- # focuses on that area.
- ELIGIBILITY = 'eligibility'
- FOCUS = 'focus'
- servicearea_type_enum = Enum(
- ELIGIBILITY, FOCUS, name='servicearea_type'
- )
- type = Column(servicearea_type_enum,
- index=True, nullable=False, default=ELIGIBILITY)
-
- __table_args__ = (
- UniqueConstraint('library_id', 'place_id', 'type'),
- )
-
-
-class Place(Base):
- __tablename__ = 'places'
-
- # These are the kinds of places we keep track of. These are not
- # supposed to be precise terms. Each census-designated place is
- # called a 'city', even if it's not a city in the legal sense.
- # Countries that call their top-level administrative divisions something
- # other than 'states' can still use 'state' as their type.
- NATION = 'nation'
- STATE = 'state'
- COUNTY = 'county'
- CITY = 'city'
- POSTAL_CODE = 'postal_code'
- LIBRARY_SERVICE_AREA = 'library_service_area'
- EVERYWHERE = 'everywhere'
-
- id = Column(Integer, primary_key=True)
-
- # The type of place.
- type = Column(Unicode(255), index=True, nullable=False)
-
- # The unique ID given to this place in the data source it was
- # derived from.
- external_id = Column(Unicode, index=True)
-
- # The name given to this place by the data source it was
- # derived from.
- external_name = Column(Unicode, index=True)
-
- # A canonical abbreviated name for this place. Generally used only
- # for nations and states.
- abbreviated_name = Column(Unicode, index=True)
-
- # The most convenient place that 'contains' this place. For most
- # places the most convenient parent will be a state. For states,
- # the best parent will be a nation. A nation has no parent; neither
- # does 'everywhere'.
- parent_id = Column(
- Integer, ForeignKey('places.id'), index=True
- )
-
- children = relationship(
- "Place",
- backref=backref("parent", remote_side = [id]),
- lazy="joined"
- )
-
- # The geography of the place itself. It is stored internally as a
- # geometry, which means we have to cast to Geography when doing
- # calculations.
- geometry = Column(Geometry(srid=4326), nullable=True)
-
- aliases = relationship("PlaceAlias", backref='place')
-
- service_areas = relationship("ServiceArea", backref="place")
-
- @classmethod
- def everywhere(cls, _db):
- """Return a special Place that represents everywhere.
-
- This place has no .geometry, so attempts to use it in
- geographic comparisons will fail.
- """
- place, is_new = get_one_or_create(
- _db, Place, type=cls.EVERYWHERE,
- create_method_kwargs=dict(external_id="Everywhere",
- external_name="Everywhere")
- )
- return place
-
- @classmethod
- def default_nation(cls, _db):
- """Return the default nation for this library registry.
-
- If an incoming coverage area doesn't mention a nation, we'll
- assume it's within this nation.
-
- :return: The default nation, if one can be found. Otherwise, None.
- """
- default_nation = None
- abbreviation=ConfigurationSetting.sitewide(
- _db, Configuration.DEFAULT_NATION_ABBREVIATION
- ).value
- if abbreviation:
- default_nation = get_one(
- _db, Place, type=Place.NATION, abbreviated_name=abbreviation
- )
- if not default_nation:
- logging.error(
- "Could not look up default nation %s", abbreviation
- )
- return default_nation
+ # A library may have a ServiceArea because people in that area are
+ # eligible for service, or because the library specifically
+ # focuses on that area.
+ ELIGIBILITY = 'eligibility'
+ FOCUS = 'focus'
+ servicearea_type_enum = Enum(
+ ELIGIBILITY, FOCUS, name='servicearea_type'
+ )
+ type = Column(servicearea_type_enum,
+ index=True, nullable=False, default=ELIGIBILITY)
- @classmethod
- def larger_place_types(cls, type):
- """Return a list of place types known to be bigger than `type`.
-
- Places don't form a strict heirarchy. In particular, ZIP codes
- are not 'smaller' than cities. But counties and cities are
- smaller than states, and states are smaller than nations, so
- if you're searching inside a state for a place called "Japan",
- you know that the nation of Japan is not what you're looking
- for.
- """
- larger = [Place.EVERYWHERE]
- if type not in (Place.NATION, Place.EVERYWHERE):
- larger.append(Place.NATION)
- if type in (Place.COUNTY, Place.CITY, Place.POSTAL_CODE):
- larger.append(Place.STATE)
- if type == Place.CITY:
- larger.append(Place.COUNTY)
- return larger
+ __table_args__ = (
+ UniqueConstraint('library_id', 'place_id', 'type'),
+ )
- @classmethod
- def parse_name(cls, place_name):
- """Try to extract a place type from a name.
- :return: A 2-tuple (place_name, place_type)
+class Place(Base):
+ """
+ A location on the earth, with a defined geometry.
- e.g. "Kern County" becomes ("Kern", Place.COUNTY)
- "Arizona State" becomes ("Arizona", Place.STATE)
- "Chicago" becaomes ("Chicago", None)
- """
- check = place_name.lower()
- place_type = None
- if check.endswith(' county'):
- place_name = place_name[:-7]
- place_type = Place.COUNTY
+ Notes:
+ * Regarding the place type constants, (NATION, CITY, etc.):
+ * These are the kinds of places we keep track of. These are not supposed to be precise terms.
+ * Each census-designated place is called a 'city', even if it's not a city in the legal sense.
+ * Countries that call their top-level administrative divisions something other than 'states'
+ can still use 'state' as their type.
- if check.endswith(' state'):
- place_name = place_name[:-6]
- place_type = Place.STATE
- return place_name, place_type
+ Place attributes/columns:
- @classmethod
- def lookup_by_name(cls, _db, name, place_type=None):
- """Look up one or more Places by name.
- """
- if not place_type:
- name, place_type = cls.parse_name(name)
- qu = _db.query(Place).outerjoin(PlaceAlias).filter(
- or_(Place.external_name==name, Place.abbreviated_name==name,
- PlaceAlias.name==name)
- )
- if place_type:
- qu = qu.filter(Place.type==place_type)
- else:
- # The place type "county" is excluded unless it was
- # explicitly asked for (e.g. "Cook County"). This is to
- # avoid ambiguity in the many cases when a state contains
- # a county and a city with the same name. In all realistic
- # cases, someone using "Foo" to talk about a library
- # service area is referring to the city of Foo, not Foo
- # County -- if they want Foo County they can say "Foo
- # County".
- qu = qu.filter(Place.type!=Place.COUNTY)
- return qu
+ id - Integer primary key
- @classmethod
- def lookup_one_by_name(cls, _db, name, place_type=None):
- return cls.lookup_by_name(_db, name, place_type).one()
+ type - The Place type, typically drawn from class constants (NATION, CITY, etc.)
- @classmethod
- def to_geojson(cls, _db, *places):
- """Convert one or more Place objects to a dictionary that will become
- a GeoJSON document when converted to JSON.
- """
- geojson = select(
- [func.ST_AsGeoJSON(Place.geometry)]
- ).where(
- Place.id.in_([x.id for x in places])
- )
- results = [x[0] for x in _db.execute(geojson)]
- if len(results) == 1:
- # There's only one item, and it is a valid
- # GeoJSON document on its own.
- return json.loads(results[0])
+ external_id - Unique ID given to this Place in the data source it was derived from
- # We have either more or less than one valid item.
- # In either case, a GeometryCollection is appropriate.
- body = { "type": "GeometryCollection",
- "geometries" : [json.loads(x) for x in results] }
- return body
+ external_name - Name given to this Place by the data source it was derived from
- @classmethod
- def name_parts(cls, name):
- """Split a nested geographic name into parts.
+ abbreviated_name - Canonical abbreviation for this Place. Generally used only for nations and states.
- "Boston, MA" is split into ["MA", "Boston"]
- "Lake County, Ohio, USA" is split into
- ["USA", "Ohio", "Lake County"]
+ geometry - The geography of the Place itself. Stored internally as a Geometry, which means we
+ have to cast to Geography when doing calculations that involve great circle distance.
- There is no guarantee that these place names correspond to
- Places in the database.
+ Place model relationships:
- :param name: The name to split into parts.
- :return: A list of place names, with the largest place at the front
- of the list.
- """
- return [x.strip() for x in reversed(name.split(",")) if x.strip()]
+ Place
+ parent - The most convenient place that 'contains' this place. For most places the most
+ convenient parent will be a state. For states, the best parent will be a nation.
+ A nation has no parent; neither does 'everywhere'.
+ children - The Places which use this Place as parent.
- @property
- def human_friendly_name(self):
- """Generate the sort of string a human would recognize as an
- unambiguous name for this place.
+ PlaceAlias
- This is in some sense the opposite of parse_name.
+ ServiceArea
+ """
+ ##### Class Constants #################################################### # noqa: E266
+ NATION = PLACE_NATION # noqa: E221
+ STATE = PLACE_STATE # noqa: E221
+ COUNTY = PLACE_COUNTY # noqa: E221
+ CITY = PLACE_CITY # noqa: E221
+ POSTAL_CODE = PLACE_POSTAL_CODE # noqa: E221
+ LIBRARY_SERVICE_AREA = PLACE_LIBRARY_SERVICE_AREA # noqa: E221
+ EVERYWHERE = PLACE_EVERYWHERE # noqa: E221
+
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
+ def __repr__(self):
+ parent = self.parent.external_name if self.parent else None
+ abbr = f"abbr={self.abbreviated_name} " if self.abbreviated_name else ''
+ return f""
- :return: A string, or None if there is no human-friendly name for
- this place.
- """
- if self.type == self.EVERYWHERE:
- # 'everywhere' is not a distinct place with a well-known name.
+ def as_centroid_point(self):
+ if not self.geometry:
return None
- if self.parent and self.parent.type == self.STATE:
- parent = self.parent.abbreviated_name or self.parent.external_name
- if self.type == Place.COUNTY:
- # Renfrew County, ON
- return "{} County, {}".format(self.external_name, parent)
- elif self.type == Place.CITY:
- # Montgomery, AL
- return "{}, {}".format(self.external_name, parent)
- # All other cases:
- # 93203
- # Texas
- # France
- return self.external_name
+ db_session = Session.object_session(self)
+ centroid = func.ST_AsEWKT(func.ST_Centroid(Place.geometry))
+ stmt = select([centroid]).where(Place.id == self.id)
+ return db_session.execute(stmt).scalar()
def overlaps_not_counting_border(self, qu):
- """Modifies a filter to find places that have points inside this
- Place, not counting the border.
+ """
+ Modifies a filter to find places that have points inside this Place, not counting the border.
- Connecticut has no points inside New York, but the two states
- share a border. This method creates a more real-world notion
- of 'inside' that does not count a shared border.
+ Connecticut has no points inside New York, but the two states share a border. This method
+ creates a more real-world notion of 'inside' that does not count a shared border.
"""
intersects = Place.geometry.intersects(self.geometry)
touches = func.ST_Touches(Place.geometry, self.geometry)
- return qu.filter(intersects).filter(touches==False)
+ return qu.filter(intersects).filter(touches == False) # noqa: E712
def lookup_inside(self, name, using_overlap=False, using_external_source=True):
+ """
+ Look up a named Place that is geographically 'inside' this Place.
- """Look up a named Place that is geographically 'inside' this Place.
-
- :param name: The name of a place, such as "Boston" or
- "Calabasas, CA", or "Cook County".
+ :param name: The name of a place, such as "Boston" or "Calabasas, CA", or "Cook County".
- :param using_overlap: If this is true, then place A is
- 'inside' place B if their shapes overlap, not counting
- borders. For example, Montgomery is 'inside' Montgomery
- County, Alabama, and the United States. However, Alabama is
- not 'inside' Georgia (even though they share a border).
+ :param using_overlap: If this is true, then place A is 'inside' place B if their shapes overlap,
+ not counting borders. For example, Montgomery is 'inside' Montgomery County, Alabama, and
+ the United States. However, Alabama is not 'inside' Georgia (even though they share a border).
- If `using_overlap` is false, then place A is 'inside' place B
- only if B is the .parent of A. In this case, Alabama is
- considered to be 'inside' the United States, but Montgomery is
- not -- the only place it's 'inside' is Alabama. Checking this way
- is much faster, so it's the default.
+ If `using_overlap` is false, then place A is 'inside' place B only if B is the .parent of A.
+ In this case, Alabama is considered to be 'inside' the United States, but Montgomery is not
+ -- the only place it's 'inside' is Alabama. Checking this way is much faster, so it's the default.
- :param using_external_source: If this is True, then if no named
- place can be found in the database, the uszipcodes library
- will be used in an attempt to find some equivalent postal codes.
+ :param using_external_source: If this is True, then if no named place can be found in the database,
+ the uszipcodes library will be used in an attempt to find some equivalent postal codes.
:return: A Place object, or None if no match could be found.
- :raise MultipleResultsFound: If more than one Place with the
- given name is 'inside' this Place.
-
+ :raise MultipleResultsFound: If more than one Place with the given name is 'inside' this Place.
"""
parts = Place.name_parts(name)
if len(parts) > 1:
- # We're trying to look up a scoped name such as "Boston,
- # MA". `name_parts` has turned "Boston, MA" into ["MA",
- # "Boston"].
+ # We're trying to look up a scoped name such as "Boston, MA". `name_parts` has turned
+ # "Boston, MA" into ["MA", "Boston"].
#
- # Now we need to look for "MA" inside ourselves, and then
- # look for "Boston" inside the object we get back.
+ # Now we need to look for "MA" inside ourselves, and then look for "Boston" inside the object we get back.
look_in_here = self
for part in parts:
look_in_here = look_in_here.lookup_inside(part, using_overlap)
@@ -1385,27 +994,23 @@ def lookup_inside(self, name, using_overlap=False, using_external_source=True):
# now contains the Place we were looking for.
return look_in_here
- # If we get here, it means we're looking up "Boston" within
- # Massachussets, or "Kern County" within the United States.
- # In other words, we expect to find at most one place with
+ # If we get here, it means we're looking up "Boston" within Massachussets, or "Kern County"
+ # within the United States. In other words, we expect to find at most one place with
# this name inside the `must_be_inside` object.
#
- # If we find more than one, it's an error. The name should
- # have been scoped better. This will happen if you search for
- # "Springfield" or "Lake County" within the United States,
- # instead of specifying which state you're talking about.
+ # If we find more than one, it's an error. The name should have been scoped better. This will
+ # happen if you search for "Springfield" or "Lake County" within the United States, instead of
+ # specifying which state you're talking about.
_db = Session.object_session(self)
- qu = Place.lookup_by_name(_db, name).filter(Place.type!=self.type)
+ qu = Place.lookup_by_name(_db, name).filter(Place.type != self.type)
- # Don't look in a place type known to be 'bigger' than this
- # place.
+ # Don't look in a place type known to be 'bigger' than this place.
exclude_types = Place.larger_place_types(self.type)
qu = qu.filter(~Place.type.in_(exclude_types))
- if self.type==self.EVERYWHERE:
- # The concept of 'inside' is not relevant because every
- # place is 'inside' EVERYWHERE. We are really trying to
- # find one and only one place with a certain name.
+ if self.type == self.EVERYWHERE:
+ # The concept of 'inside' is not relevant because every place is 'inside' EVERYWHERE.
+ # We are really trying to find one and only one place with a certain name.
pass
else:
if using_overlap and self.geometry is not None:
@@ -1413,41 +1018,31 @@ def lookup_inside(self, name, using_overlap=False, using_external_source=True):
else:
parent = aliased(Place)
grandparent = aliased(Place)
- qu = qu.join(parent, Place.parent_id==parent.id)
- qu = qu.outerjoin(grandparent, parent.parent_id==grandparent.id)
-
- # For postal codes, but no other types of places, we
- # allow the lookup to skip a level. This lets you look
- # up "93203" within a state *or* within the nation.
- postal_code_grandparent_match = and_(
- Place.type==Place.POSTAL_CODE, grandparent.id==self.id,
- )
- qu = qu.filter(
- or_(Place.parent==self, postal_code_grandparent_match)
- )
+ qu = qu.join(parent, Place.parent_id == parent.id)
+ qu = qu.outerjoin(grandparent, parent.parent_id == grandparent.id)
+
+ # For postal codes, but no other types of places, we allow the lookup to skip a level.
+ # This lets you look up "93203" within a state *or* within the nation.
+ postal_code_grandparent_match = and_(Place.type == Place.POSTAL_CODE, grandparent.id == self.id)
+ qu = qu.filter(or_(Place.parent == self, postal_code_grandparent_match))
places = qu.all()
if len(places) == 0:
if using_external_source:
- # We don't have any matching places in the database _now_,
- # but there's a possibility we can find a representative
- # postal code.
+ # We don't have any matching places in the database _now_, but there's a possibility
+ # we can find a representative postal code.
return self.lookup_one_through_external_source(name)
else:
- # We're not allowed to use uszipcodes, probably
- # because this method was called by
+ # We're not allowed to use uszipcodes, probably because this method was called by
# lookup_through_external_source.
return None
if len(places) > 1:
- raise MultipleResultsFound(
- "More than one place called %s inside %s." % (
- name, self.external_name
- )
- )
+ raise MultipleResultsFound(f"More than one place called {name} inside {self.external_name}.")
return places[0]
def lookup_one_through_external_source(self, name):
- """Use an external source to find a Place that is a) inside `self`
+ """
+ Use an external source to find a Place that is a) inside `self`
and b) identifies the place human beings call `name`.
Currently the only way this might work is when using
@@ -1457,20 +1052,18 @@ def lookup_one_through_external_source(self, name):
:return: A Place, or None if the lookup fails.
"""
if self.type != Place.STATE:
- # uszipcodes keeps track of places in terms of their state.
- return None
+ return None # uszipcodes keeps track of places in terms of their state.
- _db = Session.object_session(self)
- search = uszipcode.SearchEngine(simple_zipcode=True)
+ search = uszipcode.SearchEngine(
+ db_file_dir=Configuration.DATADIR,
+ simple_zipcode=True
+ )
state = self.abbreviated_name
uszipcode_matches = []
- if (state in search.state_to_city_mapper
- and name in search.state_to_city_mapper[state]):
+ if (state in search.state_to_city_mapper and name in search.state_to_city_mapper[state]):
# The given name is an exact match for one of the
# cities. Let's look up every ZIP code for that city.
- uszipcode_matches = search.by_city_and_state(
- name, state, returns=None
- )
+ uszipcode_matches = search.by_city_and_state(name, state, returns=None)
# Look up a Place object for each ZIP code and return the
# first one we actually know about.
@@ -1479,14 +1072,13 @@ def lookup_one_through_external_source(self, name):
# possibility of wasted effort or (I don't think this can
# happen) infinite recursion.
for match in uszipcode_matches:
- place = self.lookup_inside(
- match.zipcode, using_external_source=False
- )
+ place = self.lookup_inside(match.zipcode, using_external_source=False)
if place:
return place
def served_by(self):
- """Find all Libraries with a ServiceArea whose Place overlaps
+ """
+ Find all Libraries with a ServiceArea whose Place overlaps
this Place, not counting the border.
A Library whose ServiceArea borders this place, but does not
@@ -1495,24 +1087,207 @@ def served_by(self):
state.
"""
_db = Session.object_session(self)
- qu = _db.query(Library).join(Library.service_areas).join(
- ServiceArea.place)
+ qu = _db.query(Library).join(Library.service_areas).join(ServiceArea.place)
qu = self.overlaps_not_counting_border(qu)
return qu
- def __repr__(self):
- if self.parent:
- parent = self.parent.external_name
- else:
- parent = None
- if self.abbreviated_name:
- abbr = "abbr=%s " % self.abbreviated_name
+ ##### SQLAlchemy Table properties ######################################## # noqa: E266
+ __tablename__ = "places"
+
+ ##### SQLAlchemy non-Column components ################################### # noqa: E266
+
+ ##### SQLAlchemy Columns ################################################# # noqa: E266
+ id = Column(Integer, primary_key=True)
+ type = Column(Unicode(255), index=True, nullable=False)
+ external_id = Column(Unicode, index=True)
+ external_name = Column(Unicode, index=True)
+ abbreviated_name = Column(Unicode, index=True)
+ geometry = Column(Geometry(srid=4326), nullable=True)
+
+ ##### SQLAlchemy Relationships ########################################### # noqa: E266
+ parent_id = Column(Integer, ForeignKey('places.id'), index=True)
+ children = relationship("Place", backref=backref("parent", remote_side=[id]), lazy="joined")
+ aliases = relationship("PlaceAlias", backref='place')
+ service_areas = relationship("ServiceArea", backref="place")
+
+ ##### SQLAlchemy Field Validation ######################################## # noqa: E266
+
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+ @property
+ def library_type(self):
+ """If a library serves this place, what type of library does that make
+ it?
+ :return: A string; one of the constants from LibraryType.
+ """
+ if self.type == Place.EVERYWHERE:
+ return LibraryType.UNIVERSAL
+ elif self.type == Place.NATION:
+ return LibraryType.NATIONAL
+ elif self.type == Place.STATE:
+ # Whether this is a 'state' library, 'province' library,
+ # etc. depends on which nation it's in.
+ library_type = LibraryType.STATE
+ if self.parent and self.parent.type == Place.NATION:
+ library_type = LibraryType.ADMINISTRATIVE_DIVISION_TYPES.get(
+ self.parent.abbreviated_name, library_type
+ )
+ return library_type
+ elif self.type == Place.COUNTY:
+ return LibraryType.COUNTY
+ return LibraryType.LOCAL
+
+ @property
+ def human_friendly_name(self):
+ """Generate the sort of string a human would recognize as an
+ unambiguous name for this place.
+ This is in some sense the opposite of parse_name.
+ :return: A string, or None if there is no human-friendly name for
+ this place.
+ """
+ if self.type == self.EVERYWHERE:
+ # 'everywhere' is not a distinct place with a well-known name.
+ return None
+ if self.parent and self.parent.type == self.STATE:
+ parent = self.parent.abbreviated_name or self.parent.external_name
+ if self.type == Place.COUNTY:
+ # Renfrew County, ON
+ return "{} County, {}".format(self.external_name, parent)
+ elif self.type == Place.CITY:
+ # Montgomery, AL
+ return "{}, {}".format(self.external_name, parent)
+
+ # All other cases:
+ # 93203
+ # Texas
+ # France
+ return self.external_name
+
+ ##### Class Methods ###################################################### # noqa: E266
+ @classmethod
+ def everywhere(cls, _db):
+ """
+ Return a special Place that represents everywhere.
+
+ This place has no .geometry, so attempts to use it in geographic comparisons will fail.
+ """
+ (place, _) = get_one_or_create(
+ _db, Place, type=cls.EVERYWHERE,
+ create_method_kwargs={"external_id": "Everywhere", "external_name": "Everywhere"}
+ )
+ return place
+
+ @classmethod
+ def default_nation(cls, _db):
+ """Return the default nation for this library registry.
+
+ If an incoming coverage area doesn't mention a nation, we'll assume it's within this nation.
+
+ :return: The default nation, if one can be found. Otherwise, None.
+ """
+ default_nation = None
+ abbreviation = ConfigurationSetting.sitewide(_db, Configuration.DEFAULT_NATION_ABBREVIATION).value
+ if abbreviation:
+ default_nation = get_one(_db, Place, type=Place.NATION, abbreviated_name=abbreviation)
+ if not default_nation:
+ logging.error(f"Could not look up default nation {abbreviation}")
+ return default_nation
+
+ @classmethod
+ def larger_place_types(cls, type):
+ """
+ Return a list of place types known to be bigger than `type`.
+
+ Places don't form a strict heirarchy. In particular, ZIP codes are not 'smaller' than cities.
+ But counties and cities are smaller than states, and states are smaller than nations, so
+ if you're searching inside a state for a place called "Japan", you know that the nation of
+ Japan is not what you're looking for.
+ """
+ larger = [Place.EVERYWHERE]
+ if type not in (Place.NATION, Place.EVERYWHERE):
+ larger.append(Place.NATION)
+ if type in (Place.COUNTY, Place.CITY, Place.POSTAL_CODE):
+ larger.append(Place.STATE)
+ if type == Place.CITY:
+ larger.append(Place.COUNTY)
+ return larger
+
+ @classmethod
+ def parse_name(cls, place_name):
+ """
+ Try to extract a place type from a name.
+
+ :return: A 2-tuple (place_name, place_type)
+
+ e.g. "Kern County" becomes ("Kern", Place.COUNTY); "Arizona State" becomes ("Arizona", Place.STATE);
+ "Chicago" becaomes ("Chicago", None)
+ """
+ check = place_name.lower()
+ place_type = None
+ if check.endswith(' county'):
+ place_name = place_name[:-7]
+ place_type = Place.COUNTY
+
+ if check.endswith(' state'):
+ place_name = place_name[:-6]
+ place_type = Place.STATE
+ return place_name, place_type
+
+ @classmethod
+ def lookup_by_name(cls, _db, name, place_type=None):
+ """Look up one or more Places by name"""
+ if not place_type:
+ name, place_type = cls.parse_name(name)
+
+ qu = _db.query(Place).outerjoin(PlaceAlias).filter(
+ or_(Place.external_name == name, Place.abbreviated_name == name, PlaceAlias.name == name)
+ )
+
+ if place_type:
+ qu = qu.filter(Place.type == place_type)
else:
- abbr = ''
- output = "" % (
- self.external_name, self.type, abbr, self.external_id, parent
+ # The place type "county" is excluded unless it was explicitly asked for (e.g. "Cook County").
+ # This is to avoid ambiguity in the many cases when a state contains a county and a city with
+ # the same name. In all realistic cases, someone using "Foo" to talk about a library service area
+ # is referring to the city of Foo, not Foo County -- if they want Foo County they can say "Foo County".
+ qu = qu.filter(Place.type != Place.COUNTY)
+
+ return qu
+
+ @classmethod
+ def lookup_one_by_name(cls, _db, name, place_type=None):
+ return cls.lookup_by_name(_db, name, place_type).one()
+
+ @classmethod
+ def to_geojson(cls, _db, *places):
+ """Convert 1+ Place objects to a dict that will become a GeoJSON document when converted to JSON"""
+ geojson = select(
+ [func.ST_AsGeoJSON(Place.geometry)]
+ ).where(
+ Place.id.in_([x.id for x in places])
)
- return str(output)
+ results = [x[0] for x in _db.execute(geojson)]
+ if len(results) == 1:
+ # There's only one item, and it is a valid GeoJSON document on its own.
+ return json.loads(results[0])
+
+ # We have either more or less than one valid item. In either case, a GeometryCollection is appropriate.
+ body = {"type": "GeometryCollection", "geometries": [json.loads(x) for x in results]}
+ return body
+
+ @classmethod
+ def name_parts(cls, name):
+ """
+ Split a nested geographic name into parts.
+
+ "Boston, MA" is split into ["MA", "Boston"]
+ "Lake County, Ohio, USA" is split into ["USA", "Ohio", "Lake County"]
+
+ There is no guarantee that these place names correspond to Places in the database.
+
+ :param name: The name to split into parts.
+ :return: A list of place names, with the largest place at the front of the list.
+ """
+ return [x.strip() for x in reversed(name.split(",")) if x.strip()]
class PlaceAlias(Base):
@@ -1570,6 +1345,7 @@ def lookup(cls, _db, name):
audience, is_new = get_one_or_create(_db, Audience, name=name)
return audience
+
class CollectionSummary(Base):
"""A summary of a collection held by a library.
@@ -1609,6 +1385,7 @@ def set(cls, library, language, size):
summary.size = size
return summary
+
Index("ix_collectionsummary_language_size", CollectionSummary.language, CollectionSummary.size)
@@ -1693,10 +1470,8 @@ def notify(self, emailer, url_for):
to_address = resource.href
if to_address.startswith('mailto:'):
to_address = to_address[7:]
- deadline = None
- # Make sure there's a Validation object associated with this
- # Resource.
+ # Make sure there's a Validation object associated with this Resource.
if resource.validation is None:
resource.validation, is_new = create(_db, Validation)
else:
@@ -1713,9 +1488,9 @@ def notify(self, emailer, url_for):
# Create values for all the variables expected by the default
# templates.
template_args = dict(
- rel_desc = Hyperlink.REL_DESCRIPTIONS.get(self.rel, self.rel),
+ rel_desc=Hyperlink.REL_DESCRIPTIONS.get(self.rel, self.rel),
library=library.name,
- library_web_url = library.web_url,
+ library_web_url=library.web_url,
email=to_address,
registry_support=ConfigurationSetting.sitewide(
_db, Configuration.REGISTRY_CONTACT_EMAIL
@@ -1763,12 +1538,11 @@ class Validation(Base):
"""
__tablename__ = 'validations'
- EXPIRES_AFTER = datetime.timedelta(days=1)
+ EXPIRES_AFTER = timedelta(days=1)
id = Column(Integer, primary_key=True)
success = Column(Boolean, index=True, default=False)
- started_at = Column(DateTime, index=True, nullable=False,
- default = lambda x: datetime.datetime.utcnow())
+ started_at = Column(DateTime, index=True, nullable=False, default=datetime.utcnow)
# Used in OPDS catalogs to convey the status of a validation attempt.
STATUS_PROPERTY = "https://schema.org/reservationStatus"
@@ -1787,7 +1561,6 @@ class Validation(Base):
"Resource", backref=backref("validation", uselist=False), uselist=False
)
-
def restart(self):
"""Start a new validation attempt, cancelling any previous attempt.
@@ -1795,7 +1568,7 @@ def restart(self):
handled separately by something capable of generating the URL
to the validation controller.
"""
- self.started_at = datetime.datetime.utcnow()
+ self.started_at = datetime.utcnow()
self.secret = generate_secret()
self.success = False
@@ -1812,7 +1585,7 @@ def active(self):
An inactive Validation can't be marked as successful -- it
needs to be reset.
"""
- now = datetime.datetime.utcnow()
+ now = datetime.utcnow()
return not self.success and now < self.deadline
def mark_as_successful(self):
@@ -1895,7 +1668,7 @@ def get_one_or_create(
# We haven't heard of this patron before, but some
# other server does know about them, and they told us
# this is the delegated identifier.
- delegated_identifier=identifier_or_identifier_factory
+ delegated_identifier = identifier_or_identifier_factory
identifier.delegated_identifier = delegated_identifier
return identifier, is_new
@@ -1938,7 +1711,7 @@ def decode(self, _db, token):
"""
if not token:
raise ValueError("Cannot decode an empty token.")
- if not '|' in token:
+ if '|' not in token:
raise ValueError(
'Supposed client token "%s" does not contain a pipe.' % token
)
@@ -1971,7 +1744,7 @@ def decode_two_part(self, _db, username, password):
account_id, label, content = delegate.sign_in_standard(
username, password
)
- except Exception as e:
+ except Exception:
# This delegate couldn't help us.
pass
if account_id:
@@ -1983,7 +1756,7 @@ def decode_two_part(self, _db, username, password):
# ourselves.
try:
signature = self.adobe_base64_decode(password)
- except Exception as e:
+ except Exception:
raise ValueError("Invalid password: %s" % password)
patron_identifier, account_id = self._decode(
@@ -2041,18 +1814,18 @@ def _decode(self, _db, token, supposed_signature):
# Currently there are two ways of specifying a token's
# expiration date: as a number of minutes since self.SCT_EPOCH
# or as a number of seconds since self.JWT_EPOCH.
- now = datetime.datetime.utcnow()
+ now = datetime.utcnow()
# NOTE: The JWT code needs to be removed by the year 4869 or
# this will break.
if expiration < 1500000000:
# This is a number of minutes since the start of 2017.
- expiration = self.SCT_EPOCH + datetime.timedelta(
+ expiration = self.SCT_EPOCH + timedelta(
minutes=expiration
)
else:
# This is a number of seconds since the start of 1970.
- expiration = self.JWT_EPOCH + datetime.timedelta(seconds=expiration)
+ expiration = self.JWT_EPOCH + timedelta(seconds=expiration)
if expiration < now:
raise ValueError(
@@ -2075,6 +1848,7 @@ def _decode(self, _db, token, supposed_signature):
# Find or create a DelegatedPatronIdentifier for this person.
return patron_identifier, self.uuid
+
class ExternalIntegration(Base):
"""An external integration contains configuration for connecting
@@ -2144,7 +1918,7 @@ def __repr__(self):
@classmethod
def lookup(cls, _db, protocol, goal):
integrations = _db.query(cls).filter(
- cls.protocol==protocol, cls.goal==goal
+ cls.protocol == protocol, cls.goal == goal
)
integrations = integrations.all()
@@ -2287,8 +2061,8 @@ def explain(cls, _db, include_secrets=False):
site_wide_settings = []
for setting in _db.query(ConfigurationSetting).filter(
- ConfigurationSetting.library_id==None).filter(
- ConfigurationSetting.external_integration==None):
+ ConfigurationSetting.library_id == None).filter( # noqa: E711
+ ConfigurationSetting.external_integration == None): # noqa: E711
if not include_secrets and setting.key.endswith("_secret"):
continue
site_wide_settings.append(setting)
@@ -2390,7 +2164,7 @@ def _is_secret(self, key):
key == x or
key.startswith('%s_' % x) or
key.endswith('_%s' % x) or
- ("_%s_" %x) in key
+ ("_%s_" % x) in key
for x in ('secret', 'password')
)
@@ -2408,6 +2182,7 @@ def value_or_default(self, default):
return self.value
MEANS_YES = set(['true', 't', 'yes', 'y'])
+
@property
def bool_value(self):
"""Turn the value into a boolean if possible.
@@ -2458,18 +2233,14 @@ def json_value(self):
# Join tables for many-to-many relationships
+
libraries_audiences = Table(
'libraries_audiences', Base.metadata,
- Column(
- 'library_id', Integer, ForeignKey('libraries.id'),
- index=True, nullable=False
- ),
- Column(
- 'audience_id', Integer, ForeignKey('audiences.id'),
- index=True, nullable=False
- ),
- UniqueConstraint('library_id', 'audience_id'),
- )
+ Column('library_id', Integer, ForeignKey('libraries.id'), index=True, nullable=False),
+ Column('audience_id', Integer, ForeignKey('audiences.id'), index=True, nullable=False),
+ UniqueConstraint('library_id', 'audience_id'),
+)
+
class Admin(Base):
__tablename__ = 'admins'
diff --git a/model_helpers.py b/model_helpers.py
new file mode 100644
index 00000000..27faf6c1
--- /dev/null
+++ b/model_helpers.py
@@ -0,0 +1,57 @@
+import logging
+
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
+
+from util.string_helpers import random_string
+
+
+def generate_secret():
+ """Generate a random secret."""
+ return random_string(24)
+
+
+def get_one(db, model, on_multiple='error', **kwargs):
+ q = db.query(model).filter_by(**kwargs)
+ try:
+ return q.one()
+ except MultipleResultsFound as e:
+ if on_multiple == 'error':
+ raise e
+ elif on_multiple == 'interchangeable':
+ # These records are interchangeable so we can use whichever one we want.
+ #
+ # This may be a sign of a problem somewhere else. A db-level constraint might be useful.
+ q = q.limit(1)
+ return q.one()
+ except NoResultFound:
+ return None
+
+
+def get_one_or_create(db, model, create_method='', create_method_kwargs=None, **kwargs):
+ one = get_one(db, model, **kwargs)
+ if one:
+ return (one, False)
+ else:
+ __transaction = db.begin_nested()
+ try:
+ if 'on_multiple' in kwargs:
+ del kwargs['on_multiple'] # This kwarg is supported by get_one() but not by create().
+
+ (obj, is_new) = create(db, model, create_method, create_method_kwargs, **kwargs)
+ __transaction.commit()
+
+ return (obj, is_new)
+
+ except IntegrityError as e:
+ logging.info("INTEGRITY ERROR on %r %r, %r: %r", model, create_method_kwargs, kwargs, e)
+ __transaction.rollback()
+ raise e
+
+
+def create(db, model, create_method='', create_method_kwargs=None, **kwargs):
+ kwargs.update(create_method_kwargs or {})
+ created = getattr(model, create_method, model)(**kwargs)
+ db.add(created)
+ db.flush()
+ return (created, True)
diff --git a/opds.py b/opds.py
index 48a643a2..c50023ef 100644
--- a/opds.py
+++ b/opds.py
@@ -3,21 +3,23 @@
import flask
from sqlalchemy.orm import Query
+from constants import LibraryType
from model import (
ConfigurationSetting,
Hyperlink,
- Session,
Validation,
)
from authentication_document import AuthenticationDocument
from config import Configuration
+
class Annotator(object):
def annotate_catalog(self, catalog, live=True):
pass
+
class OPDSCatalog(object):
"""Represents an OPDS 2 Catalog Document.
https://github.com/opds-community/opds-revision/blob/master/opds-2.0.md
@@ -67,7 +69,10 @@ def __init__(self, _db, title, url, libraries, annotator=None,
# To save bandwidth, omit logos from large feeds. What 'large'
# means is customizable.
- include_logos = not (self._feed_is_large(_db, libraries))
+ #
+ # To save time, omit service area information from large feeds
+ # which we know won't use it.
+ include_logos = include_service_areas = not (self._feed_is_large(_db, libraries))
self.catalog = dict(metadata=dict(title=title), catalogs=[])
self.add_link_to_catalog(self.catalog, rel="self",
@@ -82,7 +87,8 @@ def __init__(self, _db, title, url, libraries, annotator=None,
self.library_catalog(
*library, url_for=url_for,
include_logo=include_logos,
- web_client_uri_template=web_client_uri_template
+ web_client_uri_template=web_client_uri_template,
+ include_service_area=include_service_areas
)
)
annotator.annotate_catalog(self, live=live)
@@ -115,28 +121,60 @@ def library_catalog(
include_private_information=False,
include_logo=True,
url_for=None,
- web_client_uri_template=None
+ web_client_uri_template=None,
+ include_service_area=False,
):
"""Create an OPDS catalog for a library.
+ :param distance: The distance, in meters, from the client's
+ current location (if known) to the edge of this library's
+ service area.
+
:param include_private_information: If this is True, the
consumer of this OPDS catalog is expected to be the library
whose catalog it is. Private information such as the point of
contact for integration problems will be included, where it
normally wouldn't be.
+
+ :param include_service_area: If this is True, the
+ consumer of this OPDS catalog will be using information about
+ the library's service area. TODO: This can be removed
+ once we stop using the endpoints that just give a huge
+ list of libraries.
"""
url_for = url_for or flask.url_for
+
+ modified = cls._strftime(library.timestamp)
metadata = dict(
id=library.internal_urn,
title=library.name,
- updated=cls._strftime(library.timestamp),
+ modified=modified,
+ updated=modified, # For backwards compatibility with earlier clients.
)
if distance is not None:
- metadata["distance"] = "%d km." % (distance/1000)
+ # 'distance' for backwards compatibility.
+ value = "%d km." % (distance/1000)
+ for key in 'schema:distance', 'distance':
+ metadata[key] = value
if library.description:
metadata["description"] = library.description
+
+ if include_service_area:
+ service_area_name = library.service_area_name
+ if service_area_name is not None:
+ metadata['schema:areaServed'] = service_area_name
+
+ subjects = []
+ for code in library.types:
+ subjects.append(
+ dict(code=code, name=LibraryType.NAME_FOR_CODE[code],
+ scheme=LibraryType.SCHEME_URI)
+ )
+ if subjects:
+ metadata['subject'] = subjects
+
catalog = dict(metadata=metadata)
if library.opds_url:
@@ -171,8 +209,7 @@ def library_catalog(
catalog, rel=rel, href=url, type="application/geo+json"
)
for hyperlink in library.hyperlinks:
- if (not include_private_information and hyperlink.rel in
- Hyperlink.PRIVATE_RELS):
+ if (not include_private_information and hyperlink.rel in Hyperlink.PRIVATE_RELS):
continue
args = cls._hyperlink_args(hyperlink)
if not args:
diff --git a/problem_details.py b/problem_details.py
index ae0bb32b..be5e4ee6 100644
--- a/problem_details.py
+++ b/problem_details.py
@@ -1,72 +1,77 @@
from util.problem_detail import ProblemDetail as pd
-from flask_babel import lazy_gettext as _
+from flask_babel import lazy_gettext as lgt
AUTHENTICATION_FAILURE = pd(
"http://librarysimplified.org/terms/problem/credentials-invalid",
401,
- _("The library could not be authenticated.")
+ lgt("The library could not be authenticated.")
)
NO_AUTH_URL = pd(
"http://librarysimplified.org/terms/problem/no-opds-auth-url",
400,
- _("No Authentication For OPDS URL"),
- _("You must provide the URL to an Authentication For OPDS document to register a library."),
+ lgt("No Authentication For OPDS URL"),
+ lgt("You must provide the URL to an Authentication For OPDS document to register a library."),
)
INVALID_INTEGRATION_DOCUMENT = pd(
"http://librarysimplified.org/terms/problem/invalid-integration-document",
400,
- _("Invalid Integration document"),
+ lgt("Invalid Integration document"),
)
TIMEOUT = pd(
"http://librarysimplified.org/terms/problem/timeout",
408,
- _("Request timed out"),
- _("Attempt to retrieve an Authentication For OPDS document timed out."),
+ lgt("Request timed out"),
+ lgt("Attempt to retrieve an Authentication For OPDS document timed out."),
)
-
INTEGRATION_DOCUMENT_NOT_FOUND = pd(
"http://librarysimplified.org/terms/problem/integration-document-not-found",
400,
- title=_("Document not found"),
+ title=lgt("Document not found"),
)
INTEGRATION_ERROR = pd(
"http://librarysimplified.org/terms/problem/remote-integration-failed",
500,
- title=_("Error with external integration"),
+ title=lgt("Error with external integration"),
)
ERROR_RETRIEVING_DOCUMENT = pd(
"http://librarysimplified.org/terms/problem/remote-integration-failed",
502,
- title=_("Could not retrieve document"),
- detail=_("I couldn't retrieve the specified URL."),
+ title=lgt("Could not retrieve document"),
+ detail=lgt("I couldn't retrieve the specified URL."),
)
INVALID_CONTACT_URI = pd(
"http://librarysimplified.org/terms/problem/invalid-contact-uri",
400,
- title=_("URI was not specified or is of the wrong type")
+ title=lgt("URI was not specified or is of the wrong type")
)
LIBRARY_ALREADY_IN_PRODUCTION = pd(
"http://librarysimplified.org/terms/problem/invalid-stage",
400,
- title=_("Library cannot be taken out of production once in production.")
+ title=lgt("Library cannot be taken out of production once in production.")
)
LIBRARY_NOT_FOUND = pd(
"http://librarysimplified.org/terms/problem/library-not-found",
404,
- title=_("The library does not exist in this registry."),
+ title=lgt("The library does not exist in this registry."),
)
INVALID_CREDENTIALS = pd(
"http://librarysimplified.org/terms/problem/invalid-credentials",
401,
- title=_("The username or password is incorrect.")
+ title=lgt("The username or password is incorrect.")
+)
+
+UNABLE_TO_NOTIFY = pd(
+ "http://librarysimplified.org/terms/problem/unable-to-notify",
+ 500,
+ title=lgt("Registry server unable to send notification emails.")
)
diff --git a/tests/conftest.py b/tests/conftest.py
new file mode 100644
index 00000000..dc63a54a
--- /dev/null
+++ b/tests/conftest.py
@@ -0,0 +1,526 @@
+import os
+import random
+import uuid
+from pathlib import Path
+
+import pytest
+from sqlalchemy import create_engine
+from sqlalchemy.exc import ProgrammingError
+from sqlalchemy.orm.session import Session
+
+from app import create_app, test_db_url
+from config import Configuration
+from model import (create, Admin, Audience, Base, ExternalIntegration,
+ Hyperlink, Library, Place, PlaceAlias,
+ ServiceArea, get_one_or_create)
+from util import GeometryUtility
+
+TEST_DATA_DIR = Path(os.path.dirname(__file__)) / "data"
+
+
+@pytest.fixture(autouse=True, scope="session")
+def init_test_db():
+ """For a given testing session, pave and re-initialize the database"""
+ engine = create_engine(test_db_url)
+
+ for table in reversed(Base.metadata.sorted_tables):
+ try:
+ engine.execute(table.delete())
+ except ProgrammingError:
+ ...
+
+ with engine.connect() as conn:
+ Base.metadata.create_all(conn)
+
+ engine.dispose()
+
+
+@pytest.fixture(autouse=True, scope="session")
+def setup_test_adobe_integration(init_test_db):
+ """For a given testing session, set up an Adobe integration"""
+ engine = create_engine(test_db_url)
+ with engine.connect() as connection:
+ session = Session(connection)
+ (integration, _) = create(
+ session,
+ ExternalIntegration,
+ protocol=ExternalIntegration.ADOBE_VENDOR_ID,
+ goal=ExternalIntegration.DRM_GOAL
+ )
+ integration.setting(Configuration.ADOBE_VENDOR_ID).value = "VENDORID"
+ integration.setting(Configuration.ADOBE_VENDOR_ID_NODE_VALUE).value = "0x685b35c00f05"
+ session.flush()
+ session.close()
+
+
+@pytest.fixture
+def app():
+ app = create_app(testing=True)
+ app.secret_key = "SUPER SECRET TESTING SECRET"
+ yield app
+
+
+@pytest.fixture
+def client(app):
+ with app.test_client() as client:
+ yield client
+
+
+@pytest.fixture
+def db_session(app):
+ engine = create_engine(test_db_url)
+ with engine.connect() as connection:
+ session = Session(connection)
+ yield session
+ session.close()
+
+
+@pytest.fixture
+def admin_user_credentials():
+ return ('testadmin', 'testadmin')
+
+
+@pytest.fixture
+def admin_user(db_session, admin_user_credentials):
+ (u, p) = admin_user_credentials
+ (admin, _) = get_one_or_create(db_session, Admin, username=u)
+ admin.password = Admin.make_password(p)
+ db_session.commit()
+ yield admin
+ db_session.delete(admin)
+ db_session.commit()
+
+
+@pytest.fixture
+def create_test_library():
+ """
+ Returns a constructor function for creating a Library object.
+
+ The calling function should clean up created Library objects.
+
+ Example:
+
+ def test_something(db_session, create_test_library):
+ my_lib = create_test_library(db_session)
+
+ [...test body...]
+
+ db_session.delete(my_lib)
+ db_session.commit()
+
+ """
+ def _create_test_library(db_session, library_name=None, short_name=None, eligibility_areas=None,
+ focus_areas=None, audiences=None, library_stage=Library.PRODUCTION_STAGE,
+ registry_stage=Library.PRODUCTION_STAGE, has_email=False, description=None):
+ library_name = library_name or str(uuid.uuid4())
+ create_kwargs = {
+ "authentication_url": f"https://{library_name}/",
+ "opds_url": f"https://{library_name}/",
+ "short_name": short_name or library_name,
+ "shared_secret": library_name,
+ "description": description or library_name,
+ "library_stage": library_stage,
+ "registry_stage": registry_stage,
+ }
+ (library, _) = get_one_or_create(db_session, Library, name=library_name, create_method_kwargs=create_kwargs)
+
+ if eligibility_areas and isinstance(eligibility_areas, list):
+ for place in eligibility_areas:
+ if not isinstance(place, Place):
+ # TODO: Emit a warning
+ continue
+ get_one_or_create(db_session, ServiceArea, library=library, place=place, type=ServiceArea.FOCUS)
+
+ if focus_areas and isinstance(eligibility_areas, list):
+ for place in focus_areas:
+ if not isinstance(place, Place):
+ # TODO: Emit a warning
+ continue
+ get_one_or_create(db_session, ServiceArea, library=library, place=place, type=ServiceArea.FOCUS)
+
+ audiences = audiences or [Audience.PUBLIC]
+ library.audiences = [Audience.lookup(db_session, audience) for audience in audiences]
+
+ if has_email:
+ library.set_hyperlink(Hyperlink.INTEGRATION_CONTACT_REL, f"mailto:{library_name}@library.org")
+ library.set_hyperlink(Hyperlink.HELP_REL, f"mailto:{library_name}@library.org")
+ library.set_hyperlink(Hyperlink.COPYRIGHT_DESIGNATED_AGENT_REL, f"mailto:{library_name}@library.org")
+
+ db_session.commit()
+
+ return library
+
+ return _create_test_library
+
+
+@pytest.fixture
+def create_test_place():
+ """
+ Returns a constructor function for creating a Place object.
+
+ The calling function should clean up created Place objects.
+
+ Example:
+
+ def test_something(db_session, create_test_place):
+ my_place = create_test_place(db_session)
+
+ [...test body...]
+
+ db_session.delete(my_place)
+ db_session.commit()
+
+ """
+ def _create_test_place(db_session, external_id=None, external_name=None, place_type=None,
+ abbreviated_name=None, parent=None, geometry=None):
+ if not geometry:
+ latitude = -90 + (random.randrange(1, 800) / 10)
+ longitude = -90 + (random.randrange(1, 800) / 10)
+ geometry = f"SRID=4326;POINT({latitude} {longitude})"
+ elif isinstance(geometry, str):
+ if geometry[0] == '{': # It's probably JSON.
+ geometry = GeometryUtility.from_geojson(geometry)
+ elif geometry[:5] == 'SRID=': # It's already a geometry string
+ ... # so don't do anything.
+
+ external_id = external_id or str(uuid.uuid4())
+ external_name = external_name or external_id
+ place_type = place_type or Place.CITY
+ create_kwargs = {
+ "external_id": external_id,
+ "external_name": external_name,
+ "type": place_type,
+ "abbreviated_name": abbreviated_name,
+ "parent": parent,
+ "geometry": geometry,
+ }
+ (place, _) = get_one_or_create(db_session, Place, **create_kwargs)
+ db_session.commit()
+ return place
+
+ return _create_test_place
+
+
+##############################################################################
+# Places
+##############################################################################
+
+@pytest.fixture
+def crude_us(db_session, create_test_place):
+ """
+ A Place representing the United States. Unlike other Places in this series, this is
+ backed by a crude GeoJSON drawing of the continental United States, not the much more
+ complex GeoJSON that would be obtained from an official source. This shape includes
+ large chunks of ocean, as well as portions of Canada and Mexico.
+ """
+ place = create_test_place(
+ db_session, external_id="US", external_name="United States", place_type=Place.NATION,
+ abbreviated_name="US", parent=None, geometry=(TEST_DATA_DIR / 'crude_us_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def new_york_state(db_session, create_test_place, crude_us):
+ place = create_test_place(
+ db_session, external_id="36", external_name="New York", place_type=Place.STATE,
+ abbreviated_name="NY", parent=crude_us,
+ geometry=(TEST_DATA_DIR / 'ny_state_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def connecticut_state(db_session, create_test_place, crude_us):
+ place = create_test_place(
+ db_session, external_id="09", external_name="Connecticut", place_type=Place.STATE,
+ abbreviated_name="CT", parent=crude_us,
+ geometry=(TEST_DATA_DIR / 'ct_state_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def kansas_state(db_session, create_test_place, crude_us):
+ place = create_test_place(
+ db_session, external_id="20", external_name="Kansas", place_type=Place.STATE,
+ abbreviated_name="KS", parent=crude_us,
+ geometry=(TEST_DATA_DIR / 'kansas_state_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def massachusetts_state(db_session, create_test_place, crude_us):
+ place = create_test_place(
+ db_session, external_id="25", external_name="Massachusetts", place_type=Place.STATE,
+ abbreviated_name="MA", parent=crude_us, geometry=None
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def new_mexico_state(db_session, create_test_place, crude_us):
+ place = create_test_place(
+ db_session, external_id="NM", external_name="New Mexico", place_type=Place.STATE,
+ abbreviated_name="NM", parent=crude_us,
+ geometry=(TEST_DATA_DIR / 'new_mexico_state_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def new_york_city(db_session, create_test_place, new_york_state):
+ place = create_test_place(
+ db_session, external_id="365100", external_name="New York", place_type=Place.CITY,
+ abbreviated_name=None, parent=new_york_state,
+ geometry=(TEST_DATA_DIR / 'ny_city_geojson.json').read_text()
+ )
+ for place_alias in ["Manhattan", "Brooklyn", "New York"]:
+ get_one_or_create(db_session, PlaceAlias, place=place, name=place_alias)
+
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def crude_kings_county(db_session, create_test_place, new_york_state):
+ """
+ A Place representing Kings County, NY. Unlike other Places in this series, this is
+ backed by a crude GeoJSON drawing of Kings County, not the much more complex GeoJSON
+ that would be obtained from an official source.
+ """
+ place = create_test_place(
+ db_session, external_id="Kings", external_name="Kings", place_type=Place.COUNTY,
+ abbreviated_name=None, parent=new_york_state,
+ geometry=(TEST_DATA_DIR / 'crude_kings_county_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def lake_placid_ny(db_session, create_test_place, new_york_state):
+ place = create_test_place(
+ db_session, external_id="LakePlacid", external_name="Lake Placid", place_type=Place.CITY,
+ abbreviated_name=None, parent=new_york_state,
+ geometry='SRID=4326;POINT(-73.59 44.17)'
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def crude_new_york_county(db_session, create_test_place, new_york_state):
+ place = create_test_place(
+ db_session, external_id="Manhattan", external_name="New York County", place_type=Place.COUNTY,
+ abbreviated_name="NY", parent=new_york_state,
+ geometry=(TEST_DATA_DIR / 'crude_new_york_county_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def zip_10018(db_session, create_test_place, new_york_state):
+ """ZIP code 10018, in the east side of midtown Manhattan, NYC"""
+ place = create_test_place(
+ db_session, external_id="10018", external_name="10018", place_type=Place.POSTAL_CODE,
+ abbreviated_name=None, parent=new_york_state,
+ geometry=(TEST_DATA_DIR / 'zip_10018_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def zip_11212(db_session, create_test_place, new_york_state):
+ """ZIP code 11212, in Brooklyn, NYC"""
+ place = create_test_place(
+ db_session, external_id="11212", external_name="11212", place_type=Place.POSTAL_CODE,
+ abbreviated_name=None, parent=new_york_state,
+ geometry=(TEST_DATA_DIR / 'zip_11212_geojson.json').read_text()
+ )
+ get_one_or_create(db_session, PlaceAlias, place=place, name="Brooklyn")
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def zip_12601(db_session, create_test_place, new_york_state):
+ """ZIP code 12601, in Poughkeepsie, NY"""
+ place = create_test_place(
+ db_session, external_id="12601", external_name="12601", place_type=Place.POSTAL_CODE,
+ abbreviated_name=None, parent=new_york_state,
+ geometry=(TEST_DATA_DIR / 'zip_12601_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def crude_albany(db_session, create_test_place, new_york_state):
+ """Crude representation of Albany, NY"""
+ place = create_test_place(
+ db_session, external_id="Albany", external_name="Albany", place_type=Place.CITY,
+ abbreviated_name=None, parent=new_york_state,
+ geometry=(TEST_DATA_DIR / 'crude_albany_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def boston_ma(db_session, create_test_place, massachusetts_state):
+ """Boston, Massachusetts"""
+ place = create_test_place(
+ db_session, external_id="2507000", external_name="Boston", place_type=Place.CITY,
+ abbreviated_name=None, parent=massachusetts_state,
+ geometry=(TEST_DATA_DIR / 'boston_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def manhattan_ks(db_session, create_test_place, kansas_state):
+ """Manhattan, Kansas"""
+ place = create_test_place(
+ db_session, external_id="2044250", external_name="Manhattan", place_type=Place.CITY,
+ abbreviated_name=None, parent=kansas_state,
+ geometry=(TEST_DATA_DIR / 'manhattan_ks_geojson.json').read_text()
+ )
+ db_session.commit()
+ yield place
+ db_session.delete(place)
+ db_session.commit()
+
+
+@pytest.fixture
+def places(
+ crude_us,
+ new_york_state,
+ connecticut_state,
+ kansas_state,
+ massachusetts_state,
+ new_mexico_state,
+ new_york_city,
+ crude_kings_county,
+ lake_placid_ny,
+ crude_new_york_county,
+ zip_10018,
+ zip_11212,
+ zip_12601,
+ crude_albany,
+ boston_ma,
+ manhattan_ks
+):
+ """All the Place fixtures as a dictionary"""
+ return {
+ "crude_us": crude_us,
+ "new_york_state": new_york_state,
+ "connecticut_state": connecticut_state,
+ "kansas_state": kansas_state,
+ "massachusetts_state": massachusetts_state,
+ "new_mexico_state": new_mexico_state,
+ "new_york_city": new_york_city,
+ "crude_kings_county": crude_kings_county,
+ "lake_placid_ny": lake_placid_ny,
+ "crude_new_york_county": crude_new_york_county,
+ "zip_10018": zip_10018,
+ "zip_11212": zip_11212,
+ "zip_12601": zip_12601,
+ "crude_albany": crude_albany,
+ "boston_ma": boston_ma,
+ "manhattan_ks": manhattan_ks,
+ }
+
+
+##############################################################################
+# Libraries
+##############################################################################
+
+
+@pytest.fixture
+def nypl(db_session, create_test_library, new_york_city, zip_11212):
+ """The New York Public Library"""
+ library = create_test_library(
+ db_session, library_name="NYPL", short_name="nypl",
+ eligibility_areas=[new_york_city, zip_11212], has_email=True
+ )
+ db_session.commit()
+ yield library
+ db_session.delete(library)
+ db_session.commit()
+
+
+@pytest.fixture
+def connecticut_state_library(db_session, create_test_library, connecticut_state):
+ """The Connecticut State Library"""
+ library = create_test_library(
+ db_session, library_name="Connecticut State Library", short_name="CT",
+ eligibility_areas=[connecticut_state], has_email=True
+ )
+ db_session.commit()
+ yield library
+ db_session.delete(library)
+ db_session.commit()
+
+
+@pytest.fixture
+def kansas_state_library(db_session, create_test_library, kansas_state):
+ """The Kansas State Library"""
+ library = create_test_library(
+ db_session, library_name="Kansas State Library", short_name="KS",
+ eligibility_areas=[kansas_state], has_email=True
+ )
+ db_session.commit()
+ yield library
+ db_session.delete(library)
+ db_session.commit()
+
+
+@pytest.fixture
+def libraries(connecticut_state_library, kansas_state_library, nypl):
+ """All the Library fixtures as a dictionary"""
+ return {
+ "kansas_state_library": kansas_state_library,
+ "nypl": nypl,
+ "connecticut_state_library": connecticut_state_library,
+ }
diff --git a/tests/data/boston_geojson.json b/tests/data/boston_geojson.json
new file mode 100644
index 00000000..5bede3c7
--- /dev/null
+++ b/tests/data/boston_geojson.json
@@ -0,0 +1,1538 @@
+{
+ "type": "MultiPolygon",
+ "coordinates": [
+ [
+ [
+ [
+ -70.94249,
+ 42.326847
+ ],
+ [
+ -70.94036,
+ 42.327826
+ ],
+ [
+ -70.935311,
+ 42.326581
+ ],
+ [
+ -70.93363540331329,
+ 42.3276217754451
+ ],
+ [
+ -70.9331356906241,
+ 42.3279321655888
+ ],
+ [
+ -70.932075,
+ 42.328591
+ ],
+ [
+ -70.932464,
+ 42.332228
+ ],
+ [
+ -70.930458,
+ 42.334751
+ ],
+ [
+ -70.922496,
+ 42.32639
+ ],
+ [
+ -70.9236214867381,
+ 42.3236762802129
+ ],
+ [
+ -70.92431961607339,
+ 42.3219929841536
+ ],
+ [
+ -70.925473,
+ 42.319212
+ ],
+ [
+ -70.925308,
+ 42.317223
+ ],
+ [
+ -70.928055,
+ 42.317223
+ ],
+ [
+ -70.93076,
+ 42.319027
+ ],
+ [
+ -70.93091,
+ 42.321605
+ ],
+ [
+ -70.93203287320719,
+ 42.3223711513565
+ ],
+ [
+ -70.9359019885697,
+ 42.32501110034119
+ ],
+ [
+ -70.935959,
+ 42.32505
+ ],
+ [
+ -70.939668,
+ 42.324134
+ ],
+ [
+ -70.942172,
+ 42.325624
+ ],
+ [
+ -70.94249,
+ 42.326847
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -70.958094,
+ 42.31165
+ ],
+ [
+ -70.95434,
+ 42.31299
+ ],
+ [
+ -70.951492,
+ 42.313564
+ ],
+ [
+ -70.948515,
+ 42.311937
+ ],
+ [
+ -70.94968,
+ 42.311076
+ ],
+ [
+ -70.952399,
+ 42.31098
+ ],
+ [
+ -70.9542866009988,
+ 42.30865283400819
+ ],
+ [
+ -70.95434,
+ 42.308587
+ ],
+ [
+ -70.957835,
+ 42.309831
+ ],
+ [
+ -70.958094,
+ 42.31165
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -70.968935,
+ 42.355925
+ ],
+ [
+ -70.967257,
+ 42.357069
+ ],
+ [
+ -70.967048,
+ 42.356954
+ ],
+ [
+ -70.96567482230759,
+ 42.3577655611712
+ ],
+ [
+ -70.963137,
+ 42.355815
+ ],
+ [
+ -70.956906,
+ 42.355399
+ ],
+ [
+ -70.953292,
+ 42.349698
+ ],
+ [
+ -70.953022,
+ 42.343973
+ ],
+ [
+ -70.960047,
+ 42.346506
+ ],
+ [
+ -70.965276,
+ 42.351424
+ ],
+ [
+ -70.97002445142249,
+ 42.355284031478895
+ ],
+ [
+ -70.968935,
+ 42.355925
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -70.977402,
+ 42.312294
+ ],
+ [
+ -70.970392,
+ 42.316245
+ ],
+ [
+ -70.967545,
+ 42.322895
+ ],
+ [
+ -70.957268,
+ 42.331661
+ ],
+ [
+ -70.952805,
+ 42.330627
+ ],
+ [
+ -70.953693,
+ 42.327921
+ ],
+ [
+ -70.9579179172146,
+ 42.325318600192794
+ ],
+ [
+ -70.95913,
+ 42.324572
+ ],
+ [
+ -70.963531,
+ 42.318542
+ ],
+ [
+ -70.965732,
+ 42.313469
+ ],
+ [
+ -70.968968,
+ 42.31299
+ ],
+ [
+ -70.971169,
+ 42.311171
+ ],
+ [
+ -70.974273,
+ 42.310198
+ ],
+ [
+ -70.977219,
+ 42.310249
+ ],
+ [
+ -70.977402,
+ 42.312294
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -70.989162,
+ 42.328304
+ ],
+ [
+ -70.984243,
+ 42.3284
+ ],
+ [
+ -70.983078,
+ 42.327156
+ ],
+ [
+ -70.983984,
+ 42.321317
+ ],
+ [
+ -70.985667,
+ 42.318733
+ ],
+ [
+ -70.988774,
+ 42.319212
+ ],
+ [
+ -70.988903,
+ 42.32371
+ ],
+ [
+ -70.991621,
+ 42.326294
+ ],
+ [
+ -70.989162,
+ 42.328304
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -71.017803,
+ 42.31312
+ ],
+ [
+ -71.013165,
+ 42.315419
+ ],
+ [
+ -71.00687,
+ 42.321029
+ ],
+ [
+ -70.997838,
+ 42.321205
+ ],
+ [
+ -70.998789,
+ 42.31769
+ ],
+ [
+ -71.002354,
+ 42.319096
+ ],
+ [
+ -71.005919,
+ 42.316284
+ ],
+ [
+ -71.00996,
+ 42.310484
+ ],
+ [
+ -71.0095158313266,
+ 42.309071704319
+ ],
+ [
+ -71.0084846623666,
+ 42.305792960103894
+ ],
+ [
+ -71.010031,
+ 42.305262
+ ],
+ [
+ -71.0152158859455,
+ 42.306650575221596
+ ],
+ [
+ -71.0153315878842,
+ 42.3082774662712
+ ],
+ [
+ -71.015426,
+ 42.309605
+ ],
+ [
+ -71.017803,
+ 42.31312
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -71.190904,
+ 42.283248
+ ],
+ [
+ -71.178636,
+ 42.294595
+ ],
+ [
+ -71.169808,
+ 42.300443
+ ],
+ [
+ -71.164804,
+ 42.303764
+ ],
+ [
+ -71.160104,
+ 42.300454
+ ],
+ [
+ -71.156802,
+ 42.297896
+ ],
+ [
+ -71.153573,
+ 42.295748
+ ],
+ [
+ -71.152195,
+ 42.294597
+ ],
+ [
+ -71.1503,
+ 42.295531
+ ],
+ [
+ -71.147497,
+ 42.296963
+ ],
+ [
+ -71.140135,
+ 42.302147
+ ],
+ [
+ -71.136502,
+ 42.306204
+ ],
+ [
+ -71.13448,
+ 42.30925
+ ],
+ [
+ -71.130725,
+ 42.314574
+ ],
+ [
+ -71.126999,
+ 42.318615
+ ],
+ [
+ -71.123711,
+ 42.322716
+ ],
+ [
+ -71.121528,
+ 42.323882
+ ],
+ [
+ -71.120112,
+ 42.322835
+ ],
+ [
+ -71.119539,
+ 42.322745
+ ],
+ [
+ -71.116871,
+ 42.323767
+ ],
+ [
+ -71.115589,
+ 42.326803
+ ],
+ [
+ -71.115008,
+ 42.328209
+ ],
+ [
+ -71.115079,
+ 42.328486
+ ],
+ [
+ -71.112445,
+ 42.333642
+ ],
+ [
+ -71.111488,
+ 42.334591
+ ],
+ [
+ -71.110894,
+ 42.335505
+ ],
+ [
+ -71.111456,
+ 42.335898
+ ],
+ [
+ -71.110637,
+ 42.34041
+ ],
+ [
+ -71.105938,
+ 42.343808
+ ],
+ [
+ -71.105796,
+ 42.344397
+ ],
+ [
+ -71.10674,
+ 42.34604
+ ],
+ [
+ -71.107213,
+ 42.347049
+ ],
+ [
+ -71.106894,
+ 42.348588
+ ],
+ [
+ -71.106854,
+ 42.348759
+ ],
+ [
+ -71.106702,
+ 42.349433
+ ],
+ [
+ -71.10657,
+ 42.349912
+ ],
+ [
+ -71.110936,
+ 42.350446
+ ],
+ [
+ -71.113784,
+ 42.35078
+ ],
+ [
+ -71.115808,
+ 42.351017
+ ],
+ [
+ -71.120286,
+ 42.351557
+ ],
+ [
+ -71.121311,
+ 42.351675
+ ],
+ [
+ -71.122901,
+ 42.351867
+ ],
+ [
+ -71.123522,
+ 42.351461
+ ],
+ [
+ -71.124216,
+ 42.351525
+ ],
+ [
+ -71.126215,
+ 42.350412
+ ],
+ [
+ -71.12858,
+ 42.349696
+ ],
+ [
+ -71.129746,
+ 42.34885
+ ],
+ [
+ -71.133381,
+ 42.347122
+ ],
+ [
+ -71.134254,
+ 42.346577
+ ],
+ [
+ -71.135155,
+ 42.346023
+ ],
+ [
+ -71.135985,
+ 42.345366
+ ],
+ [
+ -71.137824,
+ 42.343876
+ ],
+ [
+ -71.139977,
+ 42.34214
+ ],
+ [
+ -71.141302,
+ 42.341073
+ ],
+ [
+ -71.141754,
+ 42.340396
+ ],
+ [
+ -71.144212,
+ 42.340022
+ ],
+ [
+ -71.144779,
+ 42.339657
+ ],
+ [
+ -71.146253,
+ 42.338709
+ ],
+ [
+ -71.146197,
+ 42.337398
+ ],
+ [
+ -71.147249,
+ 42.337135
+ ],
+ [
+ -71.148478,
+ 42.336254
+ ],
+ [
+ -71.148398,
+ 42.335798
+ ],
+ [
+ -71.150103,
+ 42.335281
+ ],
+ [
+ -71.149797,
+ 42.334497
+ ],
+ [
+ -71.156059,
+ 42.33061
+ ],
+ [
+ -71.156833,
+ 42.330189
+ ],
+ [
+ -71.159723,
+ 42.333036
+ ],
+ [
+ -71.162298,
+ 42.333965
+ ],
+ [
+ -71.167565,
+ 42.333441
+ ],
+ [
+ -71.168886,
+ 42.335826
+ ],
+ [
+ -71.168936,
+ 42.338449
+ ],
+ [
+ -71.16674,
+ 42.339854
+ ],
+ [
+ -71.166699,
+ 42.340009
+ ],
+ [
+ -71.170003,
+ 42.344252
+ ],
+ [
+ -71.171898,
+ 42.346655
+ ],
+ [
+ -71.174265,
+ 42.349584
+ ],
+ [
+ -71.174708,
+ 42.350155
+ ],
+ [
+ -71.174798,
+ 42.350265
+ ],
+ [
+ -71.174798,
+ 42.350796
+ ],
+ [
+ -71.173866,
+ 42.35336
+ ],
+ [
+ -71.171487,
+ 42.356089
+ ],
+ [
+ -71.171198,
+ 42.356396
+ ],
+ [
+ -71.169474,
+ 42.358047
+ ],
+ [
+ -71.167625,
+ 42.360073
+ ],
+ [
+ -71.163716,
+ 42.358249
+ ],
+ [
+ -71.161633,
+ 42.359233
+ ],
+ [
+ -71.159598,
+ 42.359996
+ ],
+ [
+ -71.155303,
+ 42.359898
+ ],
+ [
+ -71.148565,
+ 42.361174
+ ],
+ [
+ -71.147507,
+ 42.361788
+ ],
+ [
+ -71.145098,
+ 42.364492
+ ],
+ [
+ -71.143501,
+ 42.364969
+ ],
+ [
+ -71.139997,
+ 42.364496
+ ],
+ [
+ -71.131997,
+ 42.369696
+ ],
+ [
+ -71.133197,
+ 42.372596
+ ],
+ [
+ -71.130997,
+ 42.373796
+ ],
+ [
+ -71.128338,
+ 42.373424
+ ],
+ [
+ -71.123168,
+ 42.36898
+ ],
+ [
+ -71.118497,
+ 42.368397
+ ],
+ [
+ -71.117197,
+ 42.367197
+ ],
+ [
+ -71.117193,
+ 42.364229
+ ],
+ [
+ -71.116995,
+ 42.361173
+ ],
+ [
+ -71.116929,
+ 42.358716
+ ],
+ [
+ -71.117099,
+ 42.355594
+ ],
+ [
+ -71.111001,
+ 42.352597
+ ],
+ [
+ -71.110591,
+ 42.352585
+ ],
+ [
+ -71.110387,
+ 42.352564
+ ],
+ [
+ -71.108798,
+ 42.352397
+ ],
+ [
+ -71.103017,
+ 42.352638
+ ],
+ [
+ -71.099196,
+ 42.352797
+ ],
+ [
+ -71.094042,
+ 42.35371
+ ],
+ [
+ -71.091184,
+ 42.354233
+ ],
+ [
+ -71.077095,
+ 42.358697
+ ],
+ [
+ -71.075851,
+ 42.361472
+ ],
+ [
+ -71.075777,
+ 42.361621
+ ],
+ [
+ -71.071628,
+ 42.367158
+ ],
+ [
+ -71.070738,
+ 42.367995
+ ],
+ [
+ -71.070694,
+ 42.368067
+ ],
+ [
+ -71.069795,
+ 42.369097
+ ],
+ [
+ -71.064095,
+ 42.368997
+ ],
+ [
+ -71.067091,
+ 42.371843
+ ],
+ [
+ -71.070528,
+ 42.372378
+ ],
+ [
+ -71.072595,
+ 42.372597
+ ],
+ [
+ -71.072968,
+ 42.373342
+ ],
+ [
+ -71.075696,
+ 42.380197
+ ],
+ [
+ -71.077596,
+ 42.380597
+ ],
+ [
+ -71.080595,
+ 42.380997
+ ],
+ [
+ -71.080884,
+ 42.382141
+ ],
+ [
+ -71.0795,
+ 42.383348
+ ],
+ [
+ -71.078695,
+ 42.384296
+ ],
+ [
+ -71.077508,
+ 42.385881
+ ],
+ [
+ -71.077346,
+ 42.386097
+ ],
+ [
+ -71.076796,
+ 42.386696
+ ],
+ [
+ -71.073496,
+ 42.391796
+ ],
+ [
+ -71.072696,
+ 42.390796
+ ],
+ [
+ -71.069496,
+ 42.393896
+ ],
+ [
+ -71.067396,
+ 42.394996
+ ],
+ [
+ -71.067095,
+ 42.393996
+ ],
+ [
+ -71.070896,
+ 42.388996
+ ],
+ [
+ -71.065695,
+ 42.386596
+ ],
+ [
+ -71.057395,
+ 42.387297
+ ],
+ [
+ -71.055524,
+ 42.387119
+ ],
+ [
+ -71.055295,
+ 42.387097
+ ],
+ [
+ -71.048186,
+ 42.385686
+ ],
+ [
+ -71.047284,
+ 42.385284
+ ],
+ [
+ -71.044298,
+ 42.383209
+ ],
+ [
+ -71.043264,
+ 42.383594
+ ],
+ [
+ -71.039262,
+ 42.386831
+ ],
+ [
+ -71.038357,
+ 42.386529
+ ],
+ [
+ -71.031995,
+ 42.384597
+ ],
+ [
+ -71.027712,
+ 42.384041
+ ],
+ [
+ -71.022672,
+ 42.386265
+ ],
+ [
+ -71.022428,
+ 42.386373
+ ],
+ [
+ -71.020512,
+ 42.387641
+ ],
+ [
+ -71.017794,
+ 42.390697
+ ],
+ [
+ -71.016094,
+ 42.395897
+ ],
+ [
+ -71.013395,
+ 42.397398
+ ],
+ [
+ -71.011272,
+ 42.396589
+ ],
+ [
+ -71.01193,
+ 42.395752
+ ],
+ [
+ -71.010001,
+ 42.39549
+ ],
+ [
+ -71.005861,
+ 42.393892
+ ],
+ [
+ -71.001407,
+ 42.39674
+ ],
+ [
+ -71.000683,
+ 42.396817
+ ],
+ [
+ -70.996475,
+ 42.396308
+ ],
+ [
+ -70.995047,
+ 42.393566
+ ],
+ [
+ -70.994454,
+ 42.393316
+ ],
+ [
+ -70.987974,
+ 42.392817
+ ],
+ [
+ -70.987289,
+ 42.388734
+ ],
+ [
+ -70.986053,
+ 42.388116
+ ],
+ [
+ -70.986621,
+ 42.387138
+ ],
+ [
+ -70.988281,
+ 42.387107
+ ],
+ [
+ -70.994239,
+ 42.384647
+ ],
+ [
+ -70.994681,
+ 42.382709
+ ],
+ [
+ -70.994648,
+ 42.38115
+ ],
+ [
+ -70.997994,
+ 42.378197
+ ],
+ [
+ -70.999494,
+ 42.377648
+ ],
+ [
+ -71.000206,
+ 42.377754
+ ],
+ [
+ -71.006123,
+ 42.376052
+ ],
+ [
+ -71.010242,
+ 42.365347
+ ],
+ [
+ -71.000695,
+ 42.36464
+ ],
+ [
+ -70.999046,
+ 42.364765
+ ],
+ [
+ -70.998942,
+ 42.364762
+ ],
+ [
+ -70.986597,
+ 42.364572
+ ],
+ [
+ -70.98629,
+ 42.362196
+ ],
+ [
+ -70.9857849426675,
+ 42.35828511137849
+ ],
+ [
+ -70.985954,
+ 42.358274
+ ],
+ [
+ -70.98955,
+ 42.354495
+ ],
+ [
+ -70.9958704691343,
+ 42.353255307846496
+ ],
+ [
+ -70.998253,
+ 42.352788
+ ],
+ [
+ -71.00274980667419,
+ 42.3497903026936
+ ],
+ [
+ -71.006877,
+ 42.347039
+ ],
+ [
+ -71.0078530703594,
+ 42.3452038277673
+ ],
+ [
+ -71.0091642405307,
+ 42.342738612972695
+ ],
+ [
+ -71.00997703819479,
+ 42.341210420164295
+ ],
+ [
+ -71.0107177259311,
+ 42.3398178058372
+ ],
+ [
+ -71.015664,
+ 42.330518
+ ],
+ [
+ -71.0196263822616,
+ 42.330029908969294
+ ],
+ [
+ -71.0300887391807,
+ 42.3287411432132
+ ],
+ [
+ -71.032777,
+ 42.32841
+ ],
+ [
+ -71.0343885856381,
+ 42.3275907867185
+ ],
+ [
+ -71.043160779404,
+ 42.323131639484195
+ ],
+ [
+ -71.044185,
+ 42.322611
+ ],
+ [
+ -71.03946728472471,
+ 42.3201841793004
+ ],
+ [
+ -71.033252,
+ 42.316987
+ ],
+ [
+ -71.032777,
+ 42.313472
+ ],
+ [
+ -71.037293,
+ 42.310132
+ ],
+ [
+ -71.03775500457209,
+ 42.309307939369695
+ ],
+ [
+ -71.0384731260351,
+ 42.3080270524235
+ ],
+ [
+ -71.039684963075,
+ 42.305865543089496
+ ],
+ [
+ -71.041694,
+ 42.305298
+ ],
+ [
+ -71.041387,
+ 42.301025
+ ],
+ [
+ -71.041294,
+ 42.300098
+ ],
+ [
+ -71.036666,
+ 42.291383
+ ],
+ [
+ -71.035294,
+ 42.288798
+ ],
+ [
+ -71.037894,
+ 42.284898
+ ],
+ [
+ -71.03908,
+ 42.283966
+ ],
+ [
+ -71.040494,
+ 42.281898
+ ],
+ [
+ -71.041594,
+ 42.278098
+ ],
+ [
+ -71.042794,
+ 42.276998
+ ],
+ [
+ -71.044694,
+ 42.276198
+ ],
+ [
+ -71.048794,
+ 42.277699
+ ],
+ [
+ -71.053117,
+ 42.2773
+ ],
+ [
+ -71.055494,
+ 42.275698
+ ],
+ [
+ -71.053395,
+ 42.272297
+ ],
+ [
+ -71.061593,
+ 42.267299
+ ],
+ [
+ -71.063893,
+ 42.267998
+ ],
+ [
+ -71.065651,
+ 42.271052
+ ],
+ [
+ -71.067815,
+ 42.271396
+ ],
+ [
+ -71.068139,
+ 42.271003
+ ],
+ [
+ -71.07256,
+ 42.270605
+ ],
+ [
+ -71.073264,
+ 42.270317
+ ],
+ [
+ -71.075922,
+ 42.270332
+ ],
+ [
+ -71.083552,
+ 42.268566
+ ],
+ [
+ -71.085948,
+ 42.269292
+ ],
+ [
+ -71.089403,
+ 42.26969
+ ],
+ [
+ -71.090468,
+ 42.26645
+ ],
+ [
+ -71.093737,
+ 42.267107
+ ],
+ [
+ -71.093909,
+ 42.267112
+ ],
+ [
+ -71.094529,
+ 42.266817
+ ],
+ [
+ -71.097871,
+ 42.262826
+ ],
+ [
+ -71.103672,
+ 42.259723
+ ],
+ [
+ -71.104045,
+ 42.259831
+ ],
+ [
+ -71.105595,
+ 42.260862
+ ],
+ [
+ -71.1085,
+ 42.261061
+ ],
+ [
+ -71.110576,
+ 42.261044
+ ],
+ [
+ -71.113277,
+ 42.258912
+ ],
+ [
+ -71.112938,
+ 42.258641
+ ],
+ [
+ -71.112468,
+ 42.258176
+ ],
+ [
+ -71.109544,
+ 42.255412
+ ],
+ [
+ -71.109465,
+ 42.25241
+ ],
+ [
+ -71.109347,
+ 42.24799
+ ],
+ [
+ -71.112057,
+ 42.246585
+ ],
+ [
+ -71.114563,
+ 42.245284
+ ],
+ [
+ -71.116529,
+ 42.244274
+ ],
+ [
+ -71.12567,
+ 42.239527
+ ],
+ [
+ -71.126377,
+ 42.239162
+ ],
+ [
+ -71.122701,
+ 42.234544
+ ],
+ [
+ -71.124673,
+ 42.234005
+ ],
+ [
+ -71.124716,
+ 42.232818
+ ],
+ [
+ -71.127561,
+ 42.231023
+ ],
+ [
+ -71.130808,
+ 42.22788
+ ],
+ [
+ -71.131322,
+ 42.228256
+ ],
+ [
+ -71.136665,
+ 42.23191
+ ],
+ [
+ -71.139328,
+ 42.233601
+ ],
+ [
+ -71.142681,
+ 42.235998
+ ],
+ [
+ -71.143498,
+ 42.240065
+ ],
+ [
+ -71.144069,
+ 42.242819
+ ],
+ [
+ -71.146103,
+ 42.252988
+ ],
+ [
+ -71.146196,
+ 42.253998
+ ],
+ [
+ -71.146597,
+ 42.255597
+ ],
+ [
+ -71.150386,
+ 42.25746
+ ],
+ [
+ -71.152312,
+ 42.258336
+ ],
+ [
+ -71.155958,
+ 42.256485
+ ],
+ [
+ -71.158584,
+ 42.255155
+ ],
+ [
+ -71.161574,
+ 42.257546
+ ],
+ [
+ -71.163099,
+ 42.2588
+ ],
+ [
+ -71.163427,
+ 42.258927
+ ],
+ [
+ -71.167224,
+ 42.262055
+ ],
+ [
+ -71.168627,
+ 42.263081
+ ],
+ [
+ -71.171019,
+ 42.265118
+ ],
+ [
+ -71.17458,
+ 42.267824
+ ],
+ [
+ -71.173288,
+ 42.270906
+ ],
+ [
+ -71.174555,
+ 42.272881
+ ],
+ [
+ -71.174847,
+ 42.273729
+ ],
+ [
+ -71.174565,
+ 42.275576
+ ],
+ [
+ -71.177587,
+ 42.276595
+ ],
+ [
+ -71.183701,
+ 42.275615
+ ],
+ [
+ -71.185246,
+ 42.279513
+ ],
+ [
+ -71.187231,
+ 42.280064
+ ],
+ [
+ -71.188167,
+ 42.280412
+ ],
+ [
+ -71.190258,
+ 42.281582
+ ],
+ [
+ -71.191155,
+ 42.283059
+ ],
+ [
+ -71.190904,
+ 42.283248
+ ]
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/connecticut_geojson.json b/tests/data/connecticut_geojson.json
new file mode 100644
index 00000000..5de79e12
--- /dev/null
+++ b/tests/data/connecticut_geojson.json
@@ -0,0 +1,3962 @@
+{
+ "type": "MultiPolygon",
+ "coordinates": [
+ [
+ [
+ [
+ -72.761427,
+ 41.242333
+ ],
+ [
+ -72.759733,
+ 41.248454
+ ],
+ [
+ -72.75886,
+ 41.253843
+ ],
+ [
+ -72.756353,
+ 41.25548
+ ],
+ [
+ -72.754658,
+ 41.255929
+ ],
+ [
+ -72.747678,
+ 41.255855
+ ],
+ [
+ -72.740299,
+ 41.256454
+ ],
+ [
+ -72.740099,
+ 41.255105
+ ],
+ [
+ -72.741058,
+ 41.252691
+ ],
+ [
+ -72.742891,
+ 41.252631
+ ],
+ [
+ -72.745484,
+ 41.250982
+ ],
+ [
+ -72.745661,
+ 41.249723
+ ],
+ [
+ -72.749871,
+ 41.247308
+ ],
+ [
+ -72.755655,
+ 41.245059
+ ],
+ [
+ -72.757135,
+ 41.244305
+ ],
+ [
+ -72.75966,
+ 41.242012
+ ],
+ [
+ -72.760341,
+ 41.241235
+ ],
+ [
+ -72.761427,
+ 41.242333
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.364244,
+ 41.088945
+ ],
+ [
+ -73.361764,
+ 41.087508
+ ],
+ [
+ -73.360334,
+ 41.085711
+ ],
+ [
+ -73.358808,
+ 41.086645
+ ],
+ [
+ -73.356901,
+ 41.087077
+ ],
+ [
+ -73.353754,
+ 41.087508
+ ],
+ [
+ -73.354231,
+ 41.085639
+ ],
+ [
+ -73.355089,
+ 41.083483
+ ],
+ [
+ -73.357664,
+ 41.081973
+ ],
+ [
+ -73.360141,
+ 41.08202
+ ],
+ [
+ -73.363767,
+ 41.083626
+ ],
+ [
+ -73.369775,
+ 41.088802
+ ],
+ [
+ -73.364244,
+ 41.088945
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.394189,
+ 41.067379
+ ],
+ [
+ -73.392281,
+ 41.07083
+ ],
+ [
+ -73.388181,
+ 41.073275
+ ],
+ [
+ -73.383662,
+ 41.072500293771796
+ ],
+ [
+ -73.381887,
+ 41.072196
+ ],
+ [
+ -73.381314,
+ 41.070686
+ ],
+ [
+ -73.3835825294851,
+ 41.0694191474177
+ ],
+ [
+ -73.383889,
+ 41.069248
+ ],
+ [
+ -73.386655,
+ 41.066301
+ ],
+ [
+ -73.389993,
+ 41.064287
+ ],
+ [
+ -73.38799,
+ 41.061052
+ ],
+ [
+ -73.385797,
+ 41.059757
+ ],
+ [
+ -73.386178,
+ 41.058391
+ ],
+ [
+ -73.387227,
+ 41.058247
+ ],
+ [
+ -73.391805,
+ 41.061411
+ ],
+ [
+ -73.395238,
+ 41.064431
+ ],
+ [
+ -73.394189,
+ 41.067379
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.416886,
+ 41.053932
+ ],
+ [
+ -73.404774,
+ 41.06213
+ ],
+ [
+ -73.399815,
+ 41.062418
+ ],
+ [
+ -73.399148,
+ 41.06098
+ ],
+ [
+ -73.401055,
+ 41.0576
+ ],
+ [
+ -73.401532,
+ 41.053717
+ ],
+ [
+ -73.406077,
+ 41.052361
+ ],
+ [
+ -73.409542,
+ 41.052998
+ ],
+ [
+ -73.422165,
+ 41.047562
+ ],
+ [
+ -73.416886,
+ 41.053932
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.613369,
+ 40.988883
+ ],
+ [
+ -73.611501,
+ 40.990011
+ ],
+ [
+ -73.609727,
+ 40.990786
+ ],
+ [
+ -73.608327,
+ 40.990786
+ ],
+ [
+ -73.607569,
+ 40.990397
+ ],
+ [
+ -73.608233,
+ 40.989659
+ ],
+ [
+ -73.609634,
+ 40.988742
+ ],
+ [
+ -73.612528,
+ 40.987474
+ ],
+ [
+ -73.613369,
+ 40.988883
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.630573,
+ 40.980707
+ ],
+ [
+ -73.62948,
+ 40.983646
+ ],
+ [
+ -73.626647,
+ 40.983049
+ ],
+ [
+ -73.623765,
+ 40.984696
+ ],
+ [
+ -73.622717,
+ 40.984559
+ ],
+ [
+ -73.621865,
+ 40.98247
+ ],
+ [
+ -73.622799,
+ 40.982047
+ ],
+ [
+ -73.623609,
+ 40.982138
+ ],
+ [
+ -73.625127,
+ 40.981213
+ ],
+ [
+ -73.626813,
+ 40.981906
+ ],
+ [
+ -73.627841,
+ 40.981483
+ ],
+ [
+ -73.628968,
+ 40.980685
+ ],
+ [
+ -73.630081,
+ 40.980144
+ ],
+ [
+ -73.630573,
+ 40.980707
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.645767,
+ 40.996001
+ ],
+ [
+ -73.644485,
+ 40.997605
+ ],
+ [
+ -73.644289,
+ 40.998289
+ ],
+ [
+ -73.642966,
+ 40.997833
+ ],
+ [
+ -73.640451,
+ 40.99464
+ ],
+ [
+ -73.639325,
+ 40.994028
+ ],
+ [
+ -73.638435,
+ 40.994092
+ ],
+ [
+ -73.637667,
+ 40.993249
+ ],
+ [
+ -73.637457,
+ 40.992196
+ ],
+ [
+ -73.639509,
+ 40.991329
+ ],
+ [
+ -73.639147,
+ 40.989542
+ ],
+ [
+ -73.640819,
+ 40.989236
+ ],
+ [
+ -73.64141,
+ 40.99061
+ ],
+ [
+ -73.642594,
+ 40.991597
+ ],
+ [
+ -73.644725,
+ 40.995606
+ ],
+ [
+ -73.645767,
+ 40.996001
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.727775,
+ 41.100696
+ ],
+ [
+ -73.6960060114926,
+ 41.1154076779464
+ ],
+ [
+ -73.6959488909347,
+ 41.1154341295047
+ ],
+ [
+ -73.6684334021286,
+ 41.128176084123695
+ ],
+ [
+ -73.660504402926,
+ 41.1318478687221
+ ],
+ [
+ -73.639672,
+ 41.141495
+ ],
+ [
+ -73.633975019844,
+ 41.144090804497196
+ ],
+ [
+ -73.632153,
+ 41.144921
+ ],
+ [
+ -73.62881485864709,
+ 41.1464233424058
+ ],
+ [
+ -73.61439109108869,
+ 41.152914810371
+ ],
+ [
+ -73.59706988473059,
+ 41.160710280988205
+ ],
+ [
+ -73.58745411116449,
+ 41.1650378941317
+ ],
+ [
+ -73.5861737573394,
+ 41.1656141219312
+ ],
+ [
+ -73.564941,
+ 41.17517
+ ],
+ [
+ -73.5647586708229,
+ 41.1752542879337
+ ],
+ [
+ -73.55465007369439,
+ 41.1799273346628
+ ],
+ [
+ -73.535995955855,
+ 41.1885508422818
+ ],
+ [
+ -73.514617,
+ 41.198434
+ ],
+ [
+ -73.5127650458268,
+ 41.1992931912149
+ ],
+ [
+ -73.509487,
+ 41.200814
+ ],
+ [
+ -73.5091865006584,
+ 41.2009480565066
+ ],
+ [
+ -73.50918279309809,
+ 41.2009497104956
+ ],
+ [
+ -73.50394659256919,
+ 41.2032856449013
+ ],
+ [
+ -73.4959359310458,
+ 41.206859300983105
+ ],
+ [
+ -73.4849111933569,
+ 41.2117775740592
+ ],
+ [
+ -73.482709,
+ 41.21276
+ ],
+ [
+ -73.5025525269551,
+ 41.237211341315195
+ ],
+ [
+ -73.51742744494929,
+ 41.255540325761004
+ ],
+ [
+ -73.518384,
+ 41.256719
+ ],
+ [
+ -73.5251605899493,
+ 41.2647699058786
+ ],
+ [
+ -73.5405370946926,
+ 41.2830379128492
+ ],
+ [
+ -73.5481483879656,
+ 41.292080485325
+ ],
+ [
+ -73.550961,
+ 41.295422
+ ],
+ [
+ -73.54994114379718,
+ 41.3015331068529
+ ],
+ [
+ -73.5494473159631,
+ 41.304492185449796
+ ],
+ [
+ -73.5490532504887,
+ 41.3068534754184
+ ],
+ [
+ -73.548929,
+ 41.307598
+ ],
+ [
+ -73.549574,
+ 41.315931
+ ],
+ [
+ -73.548973,
+ 41.326297
+ ],
+ [
+ -73.5485869686171,
+ 41.329941609131396
+ ],
+ [
+ -73.5452425041353,
+ 41.3615174507099
+ ],
+ [
+ -73.544728,
+ 41.366375
+ ],
+ [
+ -73.5437226736843,
+ 41.3742810466284
+ ],
+ [
+ -73.54361929444839,
+ 41.3750940374418
+ ],
+ [
+ -73.543425,
+ 41.376622
+ ],
+ [
+ -73.5434148559124,
+ 41.3767540709835
+ ],
+ [
+ -73.5424417770279,
+ 41.3894230749715
+ ],
+ [
+ -73.5423794810464,
+ 41.3902341377244
+ ],
+ [
+ -73.5412239838369,
+ 41.40527813774089
+ ],
+ [
+ -73.541169,
+ 41.405994
+ ],
+ [
+ -73.537673,
+ 41.433905
+ ],
+ [
+ -73.537469,
+ 41.43589
+ ],
+ [
+ -73.5372747912126,
+ 41.4379113250589
+ ],
+ [
+ -73.53710227334909,
+ 41.4397068909828
+ ],
+ [
+ -73.536969,
+ 41.441094
+ ],
+ [
+ -73.536067,
+ 41.451331
+ ],
+ [
+ -73.5360668139182,
+ 41.451334972042694
+ ],
+ [
+ -73.535986,
+ 41.45306
+ ],
+ [
+ -73.53589433801501,
+ 41.455034816626295
+ ],
+ [
+ -73.535885,
+ 41.455236
+ ],
+ [
+ -73.535857,
+ 41.455709
+ ],
+ [
+ -73.535769,
+ 41.457159
+ ],
+ [
+ -73.53529546019818,
+ 41.463495977276594
+ ],
+ [
+ -73.53475984465959,
+ 41.47066366093001
+ ],
+ [
+ -73.534369,
+ 41.475894
+ ],
+ [
+ -73.534269,
+ 41.476394
+ ],
+ [
+ -73.534269,
+ 41.476911
+ ],
+ [
+ -73.53415,
+ 41.47806
+ ],
+ [
+ -73.5340642743096,
+ 41.4788793571253
+ ],
+ [
+ -73.534055,
+ 41.478968
+ ],
+ [
+ -73.533969,
+ 41.479693
+ ],
+ [
+ -73.53241775653869,
+ 41.4985770634688
+ ],
+ [
+ -73.532406621006,
+ 41.4987126218851
+ ],
+ [
+ -73.5308863930724,
+ 41.517219117803194
+ ],
+ [
+ -73.5306372297182,
+ 41.5202523080875
+ ],
+ [
+ -73.530067,
+ 41.527194
+ ],
+ [
+ -73.5274208272509,
+ 41.554335593944195
+ ],
+ [
+ -73.52572611024829,
+ 41.571718178187396
+ ],
+ [
+ -73.521041,
+ 41.619773
+ ],
+ [
+ -73.520017,
+ 41.641197
+ ],
+ [
+ -73.51823760355249,
+ 41.666733981689404
+ ],
+ [
+ -73.5179500508434,
+ 41.670860790123
+ ],
+ [
+ -73.516785,
+ 41.687581
+ ],
+ [
+ -73.5165907759759,
+ 41.689711714211896
+ ],
+ [
+ -73.5159914638673,
+ 41.6962864046138
+ ],
+ [
+ -73.511921,
+ 41.740941
+ ],
+ [
+ -73.51190654632549,
+ 41.741209115662095
+ ],
+ [
+ -73.5115449368014,
+ 41.747916972334295
+ ],
+ [
+ -73.510961,
+ 41.758749
+ ],
+ [
+ -73.5079601692712,
+ 41.7915267620213
+ ],
+ [
+ -73.505008,
+ 41.823773
+ ],
+ [
+ -73.5049921230769,
+ 41.823900015384595
+ ],
+ [
+ -73.504944,
+ 41.824285
+ ],
+ [
+ -73.501984,
+ 41.858717
+ ],
+ [
+ -73.5009108171378,
+ 41.868571326657005
+ ],
+ [
+ -73.5009100939961,
+ 41.86857796678739
+ ],
+ [
+ -73.49945941077141,
+ 41.8818986289734
+ ],
+ [
+ -73.498304,
+ 41.892508
+ ],
+ [
+ -73.4965646487039,
+ 41.921747111939
+ ],
+ [
+ -73.496527,
+ 41.92238
+ ],
+ [
+ -73.49348450212139,
+ 41.953339471656
+ ],
+ [
+ -73.492975,
+ 41.958524
+ ],
+ [
+ -73.489615,
+ 42.000092
+ ],
+ [
+ -73.48822382860538,
+ 42.0300472272559
+ ],
+ [
+ -73.487314,
+ 42.049638
+ ],
+ [
+ -73.4367436437709,
+ 42.050518541412494
+ ],
+ [
+ -73.432812,
+ 42.050587
+ ],
+ [
+ -73.4261741938809,
+ 42.0504141864309
+ ],
+ [
+ -73.3406383205113,
+ 42.0481872820452
+ ],
+ [
+ -73.32773083156711,
+ 42.047851238902105
+ ],
+ [
+ -73.3256265850805,
+ 42.047796455387896
+ ],
+ [
+ -73.2962651552155,
+ 42.047032038139804
+ ],
+ [
+ -73.29442,
+ 42.046984
+ ],
+ [
+ -73.293097,
+ 42.04694
+ ],
+ [
+ -73.23333604778209,
+ 42.0450183175694
+ ],
+ [
+ -73.2329587822323,
+ 42.04500618616
+ ],
+ [
+ -73.231056,
+ 42.044945
+ ],
+ [
+ -73.229798,
+ 42.044877
+ ],
+ [
+ -73.17222083816989,
+ 42.04324110728349
+ ],
+ [
+ -73.12727608992209,
+ 42.0419641289823
+ ],
+ [
+ -73.053254,
+ 42.039861
+ ],
+ [
+ -73.00874486852759,
+ 42.03885984497129
+ ],
+ [
+ -72.999549,
+ 42.038653
+ ],
+ [
+ -72.97899983673081,
+ 42.038510322694194
+ ],
+ [
+ -72.863733,
+ 42.03771
+ ],
+ [
+ -72.863619,
+ 42.037709
+ ],
+ [
+ -72.847142,
+ 42.036894
+ ],
+ [
+ -72.8348899331935,
+ 42.036748146402694
+ ],
+ [
+ -72.813541,
+ 42.036494
+ ],
+ [
+ -72.816741,
+ 41.997595
+ ],
+ [
+ -72.79493113970959,
+ 41.999950370696496
+ ],
+ [
+ -72.77475678567849,
+ 42.002129113782196
+ ],
+ [
+ -72.770521087532,
+ 42.0025865508845
+ ],
+ [
+ -72.766739,
+ 42.002995
+ ],
+ [
+ -72.7663047683742,
+ 42.006396481069004
+ ],
+ [
+ -72.766139,
+ 42.007695
+ ],
+ [
+ -72.763265,
+ 42.009742
+ ],
+ [
+ -72.763238,
+ 42.012795
+ ],
+ [
+ -72.761238,
+ 42.014595
+ ],
+ [
+ -72.759738,
+ 42.016995
+ ],
+ [
+ -72.761354,
+ 42.018183
+ ],
+ [
+ -72.76231,
+ 42.019775
+ ],
+ [
+ -72.762151,
+ 42.021527
+ ],
+ [
+ -72.760558,
+ 42.021846
+ ],
+ [
+ -72.758151,
+ 42.020865
+ ],
+ [
+ -72.757467,
+ 42.020947
+ ],
+ [
+ -72.754038,
+ 42.025395
+ ],
+ [
+ -72.751738,
+ 42.030195
+ ],
+ [
+ -72.753538,
+ 42.032095
+ ],
+ [
+ -72.757538,
+ 42.033295
+ ],
+ [
+ -72.755838,
+ 42.036195
+ ],
+ [
+ -72.7516053156989,
+ 42.0362368951743
+ ],
+ [
+ -72.71916366349859,
+ 42.0365580031471
+ ],
+ [
+ -72.7141341571442,
+ 42.0366077852784
+ ],
+ [
+ -72.71278280191339,
+ 42.036621161013194
+ ],
+ [
+ -72.6994515854077,
+ 42.036753113599396
+ ],
+ [
+ -72.695927,
+ 42.036788
+ ],
+ [
+ -72.68608011133279,
+ 42.035968622773595
+ ],
+ [
+ -72.6729633546716,
+ 42.034877153980105
+ ],
+ [
+ -72.643134,
+ 42.032395
+ ],
+ [
+ -72.61690909138659,
+ 42.0312029925632
+ ],
+ [
+ -72.61690467080379,
+ 42.0312027916334
+ ],
+ [
+ -72.607933,
+ 42.030795
+ ],
+ [
+ -72.606933,
+ 42.024995
+ ],
+ [
+ -72.590233,
+ 42.024695
+ ],
+ [
+ -72.589829,
+ 42.024695
+ ],
+ [
+ -72.582332,
+ 42.024695
+ ],
+ [
+ -72.5742849478112,
+ 42.029510322076696
+ ],
+ [
+ -72.573231,
+ 42.030141
+ ],
+ [
+ -72.5634267784983,
+ 42.031044031842995
+ ],
+ [
+ -72.560977008977,
+ 42.03126967136829
+ ],
+ [
+ -72.56088807309929,
+ 42.031277862934495
+ ],
+ [
+ -72.5529908645778,
+ 42.0320052466196
+ ],
+ [
+ -72.55285820422401,
+ 42.032017465491194
+ ],
+ [
+ -72.5501111622106,
+ 42.032270485724496
+ ],
+ [
+ -72.5315724231202,
+ 42.0339780228017
+ ],
+ [
+ -72.5281470614453,
+ 42.0342935206376
+ ],
+ [
+ -72.528131,
+ 42.034295
+ ],
+ [
+ -72.50919168706001,
+ 42.0342165401236
+ ],
+ [
+ -72.4597281051111,
+ 42.0340116273826
+ ],
+ [
+ -72.4596911701656,
+ 42.0340114743722
+ ],
+ [
+ -72.4581852392999,
+ 42.034005235753604
+ ],
+ [
+ -72.45668,
+ 42.033999
+ ],
+ [
+ -72.44163978907079,
+ 42.033773502470595
+ ],
+ [
+ -72.3974306450291,
+ 42.033110675812004
+ ],
+ [
+ -72.3669917600491,
+ 42.0326543063241
+ ],
+ [
+ -72.3218210714148,
+ 42.03197706325
+ ],
+ [
+ -72.3212572907063,
+ 42.0319686104991
+ ],
+ [
+ -72.317148,
+ 42.031907
+ ],
+ [
+ -72.2706746240338,
+ 42.031713890667
+ ],
+ [
+ -72.249523,
+ 42.031626
+ ],
+ [
+ -72.24129015451759,
+ 42.0315261233387
+ ],
+ [
+ -72.2050807834552,
+ 42.031086849809796
+ ],
+ [
+ -72.19882718216249,
+ 42.031010984324496
+ ],
+ [
+ -72.1500724858968,
+ 42.030419517340896
+ ],
+ [
+ -72.1432410250888,
+ 42.0303366415602
+ ],
+ [
+ -72.13571500800948,
+ 42.0302453397788
+ ],
+ [
+ -72.135687,
+ 42.030245
+ ],
+ [
+ -72.1021620983386,
+ 42.028899192835496
+ ],
+ [
+ -72.0997439867964,
+ 42.02880212135501
+ ],
+ [
+ -72.063496,
+ 42.027347
+ ],
+ [
+ -72.0346321775835,
+ 42.0271700352492
+ ],
+ [
+ -72.01011364003818,
+ 42.02701971153859
+ ],
+ [
+ -72.01003960018869,
+ 42.027019257598596
+ ],
+ [
+ -71.9931020771696,
+ 42.0269154132603
+ ],
+ [
+ -71.987326,
+ 42.02688
+ ],
+ [
+ -71.9630203859623,
+ 42.0262475998751
+ ],
+ [
+ -71.9523266102909,
+ 42.0259693618902
+ ],
+ [
+ -71.9209614675912,
+ 42.025153282110004
+ ],
+ [
+ -71.9209426671443,
+ 42.0251527929471
+ ],
+ [
+ -71.89078,
+ 42.024368
+ ],
+ [
+ -71.88330606432629,
+ 42.0243017437634
+ ],
+ [
+ -71.88283042926349,
+ 42.0242975272715
+ ],
+ [
+ -71.8773822373224,
+ 42.024249229198
+ ],
+ [
+ -71.86592614936811,
+ 42.0241476712897
+ ],
+ [
+ -71.8603967710167,
+ 42.024098653501
+ ],
+ [
+ -71.8457172790675,
+ 42.023968520203795
+ ],
+ [
+ -71.8416470936308,
+ 42.023932438120596
+ ],
+ [
+ -71.80470355203181,
+ 42.0236049346286
+ ],
+ [
+ -71.80065,
+ 42.023569
+ ],
+ [
+ -71.799242,
+ 42.008065
+ ],
+ [
+ -71.7988654335405,
+ 41.9873338752955
+ ],
+ [
+ -71.79882688153009,
+ 41.9852114703
+ ],
+ [
+ -71.7983794424545,
+ 41.960578593311695
+ ],
+ [
+ -71.797922,
+ 41.935395
+ ],
+ [
+ -71.79780125342009,
+ 41.9323676992798
+ ],
+ [
+ -71.79764920214579,
+ 41.92855554217849
+ ],
+ [
+ -71.79715894256209,
+ 41.9162639874898
+ ],
+ [
+ -71.7966877946775,
+ 41.904451592213896
+ ],
+ [
+ -71.7946917826635,
+ 41.85440853003801
+ ],
+ [
+ -71.7944823560536,
+ 41.8491578858595
+ ],
+ [
+ -71.794161,
+ 41.841101
+ ],
+ [
+ -71.794161,
+ 41.840141
+ ],
+ [
+ -71.792786,
+ 41.80867
+ ],
+ [
+ -71.792767,
+ 41.807001
+ ],
+ [
+ -71.79265663505639,
+ 41.8046235902365
+ ],
+ [
+ -71.79125806357601,
+ 41.774496473912
+ ],
+ [
+ -71.791062,
+ 41.770273
+ ],
+ [
+ -71.79105925492179,
+ 41.770182676218795
+ ],
+ [
+ -71.789678,
+ 41.724734
+ ],
+ [
+ -71.7896715648332,
+ 41.7245691839672
+ ],
+ [
+ -71.7886475406628,
+ 41.698342108883395
+ ],
+ [
+ -71.7869970249528,
+ 41.65606947440539
+ ],
+ [
+ -71.786994,
+ 41.655992
+ ],
+ [
+ -71.78763664588949,
+ 41.639917146298195
+ ],
+ [
+ -71.78785519859501,
+ 41.6344503677445
+ ],
+ [
+ -71.789356,
+ 41.59691
+ ],
+ [
+ -71.7893586727423,
+ 41.5968521603427
+ ],
+ [
+ -71.7905084708522,
+ 41.57196987750189
+ ],
+ [
+ -71.7917190617471,
+ 41.54577200433501
+ ],
+ [
+ -71.7925957022037,
+ 41.5268010079481
+ ],
+ [
+ -71.79356831588959,
+ 41.5057530964788
+ ],
+ [
+ -71.7949846626488,
+ 41.4751025497798
+ ],
+ [
+ -71.795497602244,
+ 41.4640022461898
+ ],
+ [
+ -71.7964992379505,
+ 41.4423262817432
+ ],
+ [
+ -71.7967394589644,
+ 41.437127762839296
+ ],
+ [
+ -71.797235453979,
+ 41.42639414957701
+ ],
+ [
+ -71.7976736925499,
+ 41.4169104184967
+ ],
+ [
+ -71.797683,
+ 41.416709
+ ],
+ [
+ -71.801439,
+ 41.415545
+ ],
+ [
+ -71.803684,
+ 41.417428
+ ],
+ [
+ -71.806812,
+ 41.416673
+ ],
+ [
+ -71.8129,
+ 41.419404
+ ],
+ [
+ -71.816904,
+ 41.419927
+ ],
+ [
+ -71.82033,
+ 41.419382
+ ],
+ [
+ -71.823873,
+ 41.417164
+ ],
+ [
+ -71.824573,
+ 41.415235
+ ],
+ [
+ -71.827902,
+ 41.414334
+ ],
+ [
+ -71.834107,
+ 41.411582
+ ],
+ [
+ -71.836883,
+ 41.412228
+ ],
+ [
+ -71.839649,
+ 41.412119
+ ],
+ [
+ -71.842563,
+ 41.409855
+ ],
+ [
+ -71.8428165698118,
+ 41.408732207378904
+ ],
+ [
+ -71.843472,
+ 41.40583
+ ],
+ [
+ -71.843256,
+ 41.404461
+ ],
+ [
+ -71.841726,
+ 41.403241
+ ],
+ [
+ -71.84115,
+ 41.39923
+ ],
+ [
+ -71.842244,
+ 41.396879
+ ],
+ [
+ -71.8421660144265,
+ 41.3958299905162
+ ],
+ [
+ -71.842131,
+ 41.395359
+ ],
+ [
+ -71.83863230444119,
+ 41.3911510258414
+ ],
+ [
+ -71.83817,
+ 41.390595
+ ],
+ [
+ -71.835204,
+ 41.389558
+ ],
+ [
+ -71.832655,
+ 41.387156
+ ],
+ [
+ -71.83300056281949,
+ 41.3852672388358
+ ],
+ [
+ -71.833531,
+ 41.382368
+ ],
+ [
+ -71.8316433377617,
+ 41.3800224459541
+ ],
+ [
+ -71.830637,
+ 41.378772
+ ],
+ [
+ -71.83131395979309,
+ 41.3777248226273
+ ],
+ [
+ -71.832674,
+ 41.375621
+ ],
+ [
+ -71.8320765800314,
+ 41.3729621714499
+ ],
+ [
+ -71.831613,
+ 41.370899
+ ],
+ [
+ -71.8320107595773,
+ 41.370243998619195
+ ],
+ [
+ -71.8321077620934,
+ 41.3700842619703
+ ],
+ [
+ -71.832499,
+ 41.36944
+ ],
+ [
+ -71.8349469163787,
+ 41.3675609118721
+ ],
+ [
+ -71.8355881682153,
+ 41.367068669276094
+ ],
+ [
+ -71.837633,
+ 41.365499
+ ],
+ [
+ -71.8377133908183,
+ 41.36370561482929
+ ],
+ [
+ -71.83773172144579,
+ 41.3632966890791
+ ],
+ [
+ -71.837873,
+ 41.360145
+ ],
+ [
+ -71.836768,
+ 41.355103
+ ],
+ [
+ -71.835703,
+ 41.353568
+ ],
+ [
+ -71.831303,
+ 41.351295
+ ],
+ [
+ -71.829902,
+ 41.346636
+ ],
+ [
+ -71.829384,
+ 41.342413
+ ],
+ [
+ -71.830617723719,
+ 41.34124704728269
+ ],
+ [
+ -71.836156,
+ 41.336013
+ ],
+ [
+ -71.844666,
+ 41.330585
+ ],
+ [
+ -71.847709,
+ 41.329604
+ ],
+ [
+ -71.851923,
+ 41.324664
+ ],
+ [
+ -71.857458,
+ 41.320789
+ ],
+ [
+ -71.860513,
+ 41.320248
+ ],
+ [
+ -71.85957,
+ 41.322399
+ ],
+ [
+ -71.868727,
+ 41.327815
+ ],
+ [
+ -71.877521,
+ 41.336025
+ ],
+ [
+ -71.8823774862605,
+ 41.3362379310113
+ ],
+ [
+ -71.886302,
+ 41.33641
+ ],
+ [
+ -71.892665,
+ 41.33327
+ ],
+ [
+ -71.89365732907339,
+ 41.3333181458508
+ ],
+ [
+ -71.897962,
+ 41.333527
+ ],
+ [
+ -71.904655,
+ 41.327353
+ ],
+ [
+ -71.9090940294406,
+ 41.3275069485771
+ ],
+ [
+ -71.921206,
+ 41.327927
+ ],
+ [
+ -71.92763,
+ 41.33229
+ ],
+ [
+ -71.932663,
+ 41.333348
+ ],
+ [
+ -71.936284,
+ 41.337959
+ ],
+ [
+ -71.93755544038291,
+ 41.33793728453659
+ ],
+ [
+ -71.945652,
+ 41.337799
+ ],
+ [
+ -71.95413,
+ 41.327913
+ ],
+ [
+ -71.9603568021841,
+ 41.3231338731251
+ ],
+ [
+ -71.96244,
+ 41.321535
+ ],
+ [
+ -71.969266,
+ 41.321033
+ ],
+ [
+ -71.979447,
+ 41.329987
+ ],
+ [
+ -71.9802752216186,
+ 41.3299490109487
+ ],
+ [
+ -71.982194,
+ 41.329861
+ ],
+ [
+ -71.988153,
+ 41.320577
+ ],
+ [
+ -71.989231,
+ 41.315856
+ ],
+ [
+ -71.993724,
+ 41.319536
+ ],
+ [
+ -72.0001008130767,
+ 41.318344817919694
+ ],
+ [
+ -72.000678,
+ 41.318237
+ ],
+ [
+ -72.0036509005825,
+ 41.31054674205419
+ ],
+ [
+ -72.005143,
+ 41.306687
+ ],
+ [
+ -72.00569185040379,
+ 41.3067203454328
+ ],
+ [
+ -72.0102887045407,
+ 41.306999627527794
+ ],
+ [
+ -72.010838,
+ 41.307033
+ ],
+ [
+ -72.0115673936891,
+ 41.3076796279495
+ ],
+ [
+ -72.0202819284619,
+ 41.3154053072847
+ ],
+ [
+ -72.021898,
+ 41.316838
+ ],
+ [
+ -72.027497,
+ 41.316034
+ ],
+ [
+ -72.030262,
+ 41.312121
+ ],
+ [
+ -72.035341,
+ 41.312821
+ ],
+ [
+ -72.036447,
+ 41.31587
+ ],
+ [
+ -72.041527,
+ 41.318488
+ ],
+ [
+ -72.049123,
+ 41.319127
+ ],
+ [
+ -72.0547506764111,
+ 41.313326091497494
+ ],
+ [
+ -72.055068,
+ 41.312999
+ ],
+ [
+ -72.060535,
+ 41.312107
+ ],
+ [
+ -72.065048,
+ 41.315238
+ ],
+ [
+ -72.066956,
+ 41.318893
+ ],
+ [
+ -72.074104,
+ 41.318993
+ ],
+ [
+ -72.0820020402424,
+ 41.3172242653722
+ ],
+ [
+ -72.088478,
+ 41.315774
+ ],
+ [
+ -72.0913367349466,
+ 41.3150024051527
+ ],
+ [
+ -72.094443,
+ 41.314164
+ ],
+ [
+ -72.093097,
+ 41.309429
+ ],
+ [
+ -72.098438,
+ 41.307642
+ ],
+ [
+ -72.1011122448683,
+ 41.304096793875004
+ ],
+ [
+ -72.101358,
+ 41.303771
+ ],
+ [
+ -72.107782,
+ 41.302861
+ ],
+ [
+ -72.11182,
+ 41.299098
+ ],
+ [
+ -72.123044,
+ 41.301751
+ ],
+ [
+ -72.12549875199339,
+ 41.3012342216659
+ ],
+ [
+ -72.134221,
+ 41.299398
+ ],
+ [
+ -72.144041,
+ 41.30291
+ ],
+ [
+ -72.149665,
+ 41.310857
+ ],
+ [
+ -72.1559882169118,
+ 41.3130622872205
+ ],
+ [
+ -72.15632,
+ 41.313178
+ ],
+ [
+ -72.16158,
+ 41.310262
+ ],
+ [
+ -72.161073,
+ 41.306929
+ ],
+ [
+ -72.164401,
+ 41.303715
+ ],
+ [
+ -72.172715,
+ 41.309596
+ ],
+ [
+ -72.173922,
+ 41.317597
+ ],
+ [
+ -72.1774650579298,
+ 41.3222891577989
+ ],
+ [
+ -72.177622,
+ 41.322497
+ ],
+ [
+ -72.184122,
+ 41.323997
+ ],
+ [
+ -72.191022,
+ 41.323197
+ ],
+ [
+ -72.1915159517901,
+ 41.3228407847668
+ ],
+ [
+ -72.201422,
+ 41.315697
+ ],
+ [
+ -72.203022,
+ 41.313197
+ ],
+ [
+ -72.2035779661765,
+ 41.3053578769112
+ ],
+ [
+ -72.2036432942295,
+ 41.304436751363795
+ ],
+ [
+ -72.2039880302184,
+ 41.299575973921094
+ ],
+ [
+ -72.204022,
+ 41.299097
+ ],
+ [
+ -72.2014,
+ 41.28847
+ ],
+ [
+ -72.205109,
+ 41.285187
+ ],
+ [
+ -72.209992,
+ 41.286065
+ ],
+ [
+ -72.212924,
+ 41.291365
+ ],
+ [
+ -72.221836656073,
+ 41.2928355698146
+ ],
+ [
+ -72.225009,
+ 41.293359
+ ],
+ [
+ -72.22519341075159,
+ 41.297287570619396
+ ],
+ [
+ -72.225219986622,
+ 41.2978537262402
+ ],
+ [
+ -72.225276,
+ 41.299047
+ ],
+ [
+ -72.231815,
+ 41.296574
+ ],
+ [
+ -72.235531,
+ 41.300413
+ ],
+ [
+ -72.241173,
+ 41.300153
+ ],
+ [
+ -72.24545,
+ 41.297466
+ ],
+ [
+ -72.248161,
+ 41.299488
+ ],
+ [
+ -72.24881037219129,
+ 41.2993370479212
+ ],
+ [
+ -72.2515208189592,
+ 41.2987069815596
+ ],
+ [
+ -72.251895,
+ 41.29862
+ ],
+ [
+ -72.250515,
+ 41.294386
+ ],
+ [
+ -72.251323,
+ 41.289997
+ ],
+ [
+ -72.261487,
+ 41.282926
+ ],
+ [
+ -72.268805,
+ 41.28443
+ ],
+ [
+ -72.27798,
+ 41.284062
+ ],
+ [
+ -72.2801917116802,
+ 41.2829879661633
+ ],
+ [
+ -72.284687,
+ 41.280805
+ ],
+ [
+ -72.298804,
+ 41.27892
+ ],
+ [
+ -72.31776,
+ 41.277782
+ ],
+ [
+ -72.327595,
+ 41.27846
+ ],
+ [
+ -72.3288945897681,
+ 41.2793793478341
+ ],
+ [
+ -72.32928529009929,
+ 41.2796557346694
+ ],
+ [
+ -72.333894,
+ 41.282916
+ ],
+ [
+ -72.34171,
+ 41.296394
+ ],
+ [
+ -72.346463,
+ 41.311214
+ ],
+ [
+ -72.3490378627189,
+ 41.3115555309125
+ ],
+ [
+ -72.350504,
+ 41.31175
+ ],
+ [
+ -72.356208,
+ 41.299609
+ ],
+ [
+ -72.3562145842289,
+ 41.299376809104004
+ ],
+ [
+ -72.356446,
+ 41.291216
+ ],
+ [
+ -72.3561972493021,
+ 41.2909854607838
+ ],
+ [
+ -72.35581509319589,
+ 41.290631283006796
+ ],
+ [
+ -72.349316,
+ 41.284608
+ ],
+ [
+ -72.3477368421903,
+ 41.280899491349395
+ ],
+ [
+ -72.34566805454621,
+ 41.276041131515
+ ],
+ [
+ -72.345513,
+ 41.275677
+ ],
+ [
+ -72.3439719887267,
+ 41.2720508725429
+ ],
+ [
+ -72.34261,
+ 41.268846
+ ],
+ [
+ -72.348101,
+ 41.270141
+ ],
+ [
+ -72.359063,
+ 41.268114
+ ],
+ [
+ -72.35997567099369,
+ 41.267624802372396
+ ],
+ [
+ -72.3640138656714,
+ 41.2654603035885
+ ],
+ [
+ -72.367617,
+ 41.263529
+ ],
+ [
+ -72.378573,
+ 41.264575
+ ],
+ [
+ -72.386629,
+ 41.261798
+ ],
+ [
+ -72.38897106658659,
+ 41.2649781142955
+ ],
+ [
+ -72.3945701218396,
+ 41.2725806460736
+ ],
+ [
+ -72.39815417063889,
+ 41.277447153664596
+ ],
+ [
+ -72.398688,
+ 41.278172
+ ],
+ [
+ -72.405718,
+ 41.276801
+ ],
+ [
+ -72.4166552242223,
+ 41.2782926471396
+ ],
+ [
+ -72.417699,
+ 41.278435
+ ],
+ [
+ -72.421679,
+ 41.275074
+ ],
+ [
+ -72.426161,
+ 41.274128
+ ],
+ [
+ -72.4311009477311,
+ 41.2760566928499
+ ],
+ [
+ -72.437966,
+ 41.278737
+ ],
+ [
+ -72.451925,
+ 41.278885
+ ],
+ [
+ -72.462256,
+ 41.274484
+ ],
+ [
+ -72.468102,
+ 41.269012
+ ],
+ [
+ -72.471024063245,
+ 41.26973049695739
+ ],
+ [
+ -72.4719752527142,
+ 41.269964381949805
+ ],
+ [
+ -72.4725183102771,
+ 41.270097912669
+ ],
+ [
+ -72.472539,
+ 41.270103
+ ],
+ [
+ -72.485693,
+ 41.270881
+ ],
+ [
+ -72.4862274061012,
+ 41.270687369005294
+ ],
+ [
+ -72.499534,
+ 41.265866
+ ],
+ [
+ -72.507133,
+ 41.260147
+ ],
+ [
+ -72.506974,
+ 41.256896
+ ],
+ [
+ -72.51031,
+ 41.256613
+ ],
+ [
+ -72.514529,
+ 41.258529
+ ],
+ [
+ -72.51802,
+ 41.257762
+ ],
+ [
+ -72.521312,
+ 41.2656
+ ],
+ [
+ -72.5218958750572,
+ 41.2655150556895
+ ],
+ [
+ -72.529416,
+ 41.264421
+ ],
+ [
+ -72.533247,
+ 41.26269
+ ],
+ [
+ -72.536032,
+ 41.25753
+ ],
+ [
+ -72.53633000223189,
+ 41.254811088302496
+ ],
+ [
+ -72.536759,
+ 41.250897
+ ],
+ [
+ -72.543941,
+ 41.248704
+ ],
+ [
+ -72.5469155277365,
+ 41.2508252719589
+ ],
+ [
+ -72.5706046900754,
+ 41.2677190985594
+ ],
+ [
+ -72.57107541105749,
+ 41.2680547912502
+ ],
+ [
+ -72.571136,
+ 41.268098
+ ],
+ [
+ -72.583336,
+ 41.271698
+ ],
+ [
+ -72.5851726267595,
+ 41.27132317821229
+ ],
+ [
+ -72.5909667135432,
+ 41.2701407115218
+ ],
+ [
+ -72.598036,
+ 41.268698
+ ],
+ [
+ -72.601192,
+ 41.269517
+ ],
+ [
+ -72.60408,
+ 41.270771
+ ],
+ [
+ -72.60781325853279,
+ 41.270447373873296
+ ],
+ [
+ -72.607956,
+ 41.270435
+ ],
+ [
+ -72.61035853222701,
+ 41.2708396070327
+ ],
+ [
+ -72.617237,
+ 41.271998
+ ],
+ [
+ -72.61752118034839,
+ 41.2719395290835
+ ],
+ [
+ -72.6192148372338,
+ 41.271591054353
+ ],
+ [
+ -72.63136296231401,
+ 41.2690915429994
+ ],
+ [
+ -72.641538,
+ 41.266998
+ ],
+ [
+ -72.653838,
+ 41.265897
+ ],
+ [
+ -72.65453175216768,
+ 41.2657632719328
+ ],
+ [
+ -72.658424,
+ 41.265013
+ ],
+ [
+ -72.661028,
+ 41.268533
+ ],
+ [
+ -72.6621840014098,
+ 41.268933202255695
+ ],
+ [
+ -72.665667,
+ 41.270139
+ ],
+ [
+ -72.6675584984645,
+ 41.2661897563616
+ ],
+ [
+ -72.667806,
+ 41.265673
+ ],
+ [
+ -72.67041418099919,
+ 41.2664347982888
+ ],
+ [
+ -72.672339,
+ 41.266997
+ ],
+ [
+ -72.67431886746701,
+ 41.2655200350521
+ ],
+ [
+ -72.678701,
+ 41.262251
+ ],
+ [
+ -72.677477,
+ 41.254767
+ ],
+ [
+ -72.684939,
+ 41.257597
+ ],
+ [
+ -72.6851388224456,
+ 41.255498864321595
+ ],
+ [
+ -72.6853985730337,
+ 41.2527714831461
+ ],
+ [
+ -72.685539,
+ 41.251297
+ ],
+ [
+ -72.6902367263958,
+ 41.246886889506
+ ],
+ [
+ -72.690439,
+ 41.246697
+ ],
+ [
+ -72.6934409177529,
+ 41.2454927463509
+ ],
+ [
+ -72.694744,
+ 41.24497
+ ],
+ [
+ -72.69546977896971,
+ 41.2449475640846
+ ],
+ [
+ -72.7018060024966,
+ 41.244751693191404
+ ],
+ [
+ -72.710595,
+ 41.24448
+ ],
+ [
+ -72.713674,
+ 41.249007
+ ],
+ [
+ -72.711208,
+ 41.251018
+ ],
+ [
+ -72.71246,
+ 41.254167
+ ],
+ [
+ -72.722439,
+ 41.259138
+ ],
+ [
+ -72.732813,
+ 41.254727
+ ],
+ [
+ -72.737712,
+ 41.257487
+ ],
+ [
+ -72.735307,
+ 41.261028
+ ],
+ [
+ -72.73681037346579,
+ 41.2613227898949
+ ],
+ [
+ -72.740774,
+ 41.2621
+ ],
+ [
+ -72.75147,
+ 41.258348
+ ],
+ [
+ -72.751707,
+ 41.2621
+ ],
+ [
+ -72.752166,
+ 41.26563
+ ],
+ [
+ -72.754444,
+ 41.266913
+ ],
+ [
+ -72.757477,
+ 41.266913
+ ],
+ [
+ -72.772354,
+ 41.262933
+ ],
+ [
+ -72.777629,
+ 41.265425
+ ],
+ [
+ -72.786142,
+ 41.264796
+ ],
+ [
+ -72.7861532046386,
+ 41.264780984058596
+ ],
+ [
+ -72.790687,
+ 41.258705
+ ],
+ [
+ -72.79991179130229,
+ 41.2577621239595
+ ],
+ [
+ -72.800114922249,
+ 41.257741361722594
+ ],
+ [
+ -72.800275,
+ 41.257725
+ ],
+ [
+ -72.80568100588589,
+ 41.255019525551695
+ ],
+ [
+ -72.806837,
+ 41.254441
+ ],
+ [
+ -72.81124,
+ 41.250201
+ ],
+ [
+ -72.818542,
+ 41.24852
+ ],
+ [
+ -72.819372,
+ 41.254061
+ ],
+ [
+ -72.823563,
+ 41.255564
+ ],
+ [
+ -72.8224196356139,
+ 41.2589198401839
+ ],
+ [
+ -72.821823,
+ 41.260671
+ ],
+ [
+ -72.827052,
+ 41.263529
+ ],
+ [
+ -72.8274549425703,
+ 41.2629466241038
+ ],
+ [
+ -72.830142,
+ 41.259063
+ ],
+ [
+ -72.832281,
+ 41.254596
+ ],
+ [
+ -72.835846,
+ 41.248341
+ ],
+ [
+ -72.8406,
+ 41.251022
+ ],
+ [
+ -72.842025,
+ 41.256708
+ ],
+ [
+ -72.847767,
+ 41.25669
+ ],
+ [
+ -72.8485853153682,
+ 41.25630613204589
+ ],
+ [
+ -72.85021,
+ 41.255544
+ ],
+ [
+ -72.851057,
+ 41.250128
+ ],
+ [
+ -72.854055,
+ 41.24774
+ ],
+ [
+ -72.85977209613749,
+ 41.245823843344205
+ ],
+ [
+ -72.861344,
+ 41.245297
+ ],
+ [
+ -72.8810067309627,
+ 41.2426558690314
+ ],
+ [
+ -72.881445,
+ 41.242597
+ ],
+ [
+ -72.895445,
+ 41.243697
+ ],
+ [
+ -72.9008033370427,
+ 41.2458644172307
+ ],
+ [
+ -72.904345,
+ 41.247297
+ ],
+ [
+ -72.905245,
+ 41.248297
+ ],
+ [
+ -72.903045,
+ 41.252797
+ ],
+ [
+ -72.9028077380474,
+ 41.2528941916432
+ ],
+ [
+ -72.896615271271,
+ 41.2554308647805
+ ],
+ [
+ -72.894745,
+ 41.256197
+ ],
+ [
+ -72.894729565167,
+ 41.2562604543135
+ ],
+ [
+ -72.8946664268966,
+ 41.25652002275859
+ ],
+ [
+ -72.893845,
+ 41.259897
+ ],
+ [
+ -72.89618918723679,
+ 41.2636588715478
+ ],
+ [
+ -72.8963698914716,
+ 41.2639488595268
+ ],
+ [
+ -72.897496,
+ 41.265756
+ ],
+ [
+ -72.905481,
+ 41.270125
+ ],
+ [
+ -72.9051877899981,
+ 41.2714526429645
+ ],
+ [
+ -72.904104,
+ 41.27636
+ ],
+ [
+ -72.9060492973471,
+ 41.2826929201672
+ ],
+ [
+ -72.906194,
+ 41.283164
+ ],
+ [
+ -72.906432,
+ 41.292183
+ ],
+ [
+ -72.90734073911149,
+ 41.295253911480295
+ ],
+ [
+ -72.907621,
+ 41.296201
+ ],
+ [
+ -72.913087,
+ 41.296737
+ ],
+ [
+ -72.921881,
+ 41.289326
+ ],
+ [
+ -72.92639412237381,
+ 41.28314619537319
+ ],
+ [
+ -72.9269914417402,
+ 41.2823282877966
+ ],
+ [
+ -72.927229,
+ 41.282003
+ ],
+ [
+ -72.9283405714876,
+ 41.2815765593094
+ ],
+ [
+ -72.932815,
+ 41.27986
+ ],
+ [
+ -72.932731,
+ 41.281929
+ ],
+ [
+ -72.936489,
+ 41.281698
+ ],
+ [
+ -72.937717,
+ 41.281986
+ ],
+ [
+ -72.9381977329184,
+ 41.2808688519725
+ ],
+ [
+ -72.9382603569286,
+ 41.2807233235787
+ ],
+ [
+ -72.93856,
+ 41.280027
+ ],
+ [
+ -72.9381476760994,
+ 41.2784775221015
+ ],
+ [
+ -72.938023,
+ 41.278009
+ ],
+ [
+ -72.936566,
+ 41.276972
+ ],
+ [
+ -72.9365558635634,
+ 41.27671229521879
+ ],
+ [
+ -72.936413,
+ 41.273052
+ ],
+ [
+ -72.93605871007941,
+ 41.2727597498342
+ ],
+ [
+ -72.934597,
+ 41.271554
+ ],
+ [
+ -72.93038271574409,
+ 41.2681366596667
+ ],
+ [
+ -72.930081,
+ 41.267892
+ ],
+ [
+ -72.9291193141172,
+ 41.2671340837161
+ ],
+ [
+ -72.92887613660321,
+ 41.2669424325739
+ ],
+ [
+ -72.9279380490874,
+ 41.2662031144487
+ ],
+ [
+ -72.926834,
+ 41.265333
+ ],
+ [
+ -72.929582,
+ 41.263207
+ ],
+ [
+ -72.93078911326079,
+ 41.262491143982594
+ ],
+ [
+ -72.93124221992501,
+ 41.2622224375218
+ ],
+ [
+ -72.935322,
+ 41.259803
+ ],
+ [
+ -72.93667179759478,
+ 41.25930058516779
+ ],
+ [
+ -72.939137,
+ 41.258383
+ ],
+ [
+ -72.9401359763307,
+ 41.25815546114249
+ ],
+ [
+ -72.94188263183989,
+ 41.2577576218877
+ ],
+ [
+ -72.9420263843415,
+ 41.2577248790899
+ ],
+ [
+ -72.953612,
+ 41.255086
+ ],
+ [
+ -72.957213,
+ 41.252432
+ ],
+ [
+ -72.9600350564362,
+ 41.251944532659394
+ ],
+ [
+ -72.962047,
+ 41.251597
+ ],
+ [
+ -72.9665310209584,
+ 41.2455100503179
+ ],
+ [
+ -72.970994354728,
+ 41.239451182992696
+ ],
+ [
+ -72.975136,
+ 41.233829
+ ],
+ [
+ -72.978347,
+ 41.23331
+ ],
+ [
+ -72.9786667793222,
+ 41.233450441295396
+ ],
+ [
+ -72.98106338150319,
+ 41.2345029856333
+ ],
+ [
+ -72.981134,
+ 41.234534
+ ],
+ [
+ -72.9816737559306,
+ 41.234674021493596
+ ],
+ [
+ -72.9817193708245,
+ 41.2346858547412
+ ],
+ [
+ -72.9849734321311,
+ 41.2355300113286
+ ],
+ [
+ -72.985143,
+ 41.235574
+ ],
+ [
+ -72.98519968739329,
+ 41.2355107510109
+ ],
+ [
+ -72.9858113738396,
+ 41.2348282615352
+ ],
+ [
+ -72.987035,
+ 41.233463
+ ],
+ [
+ -72.987546,
+ 41.231098
+ ],
+ [
+ -72.9903382779045,
+ 41.2265183164441
+ ],
+ [
+ -72.992042,
+ 41.223724
+ ],
+ [
+ -72.992300372398,
+ 41.2236790713761
+ ],
+ [
+ -72.9928344130653,
+ 41.223586206532595
+ ],
+ [
+ -72.997948,
+ 41.222697
+ ],
+ [
+ -73.00000818235159,
+ 41.22191806752579
+ ],
+ [
+ -73.00208768001781,
+ 41.2211318321419
+ ],
+ [
+ -73.004301,
+ 41.220295
+ ],
+ [
+ -73.0057365725887,
+ 41.21583044441
+ ],
+ [
+ -73.005938946044,
+ 41.2152010735596
+ ],
+ [
+ -73.007548,
+ 41.210197
+ ],
+ [
+ -73.012933220498,
+ 41.2059033782517
+ ],
+ [
+ -73.0134651172266,
+ 41.2054792984275
+ ],
+ [
+ -73.014948,
+ 41.204297
+ ],
+ [
+ -73.01956855548919,
+ 41.204119320496496
+ ],
+ [
+ -73.020149,
+ 41.204097
+ ],
+ [
+ -73.0202391867704,
+ 41.2047884319066
+ ],
+ [
+ -73.020449,
+ 41.206397
+ ],
+ [
+ -73.022549,
+ 41.207197
+ ],
+ [
+ -73.0230117943496,
+ 41.2072188483804
+ ],
+ [
+ -73.029645,
+ 41.207532
+ ],
+ [
+ -73.034251,
+ 41.206167
+ ],
+ [
+ -73.0357241403689,
+ 41.2044291734347
+ ],
+ [
+ -73.0362276566123,
+ 41.2038351880126
+ ],
+ [
+ -73.037941,
+ 41.201814
+ ],
+ [
+ -73.044497,
+ 41.20954
+ ],
+ [
+ -73.0456020141911,
+ 41.2096579903012
+ ],
+ [
+ -73.0489759957363,
+ 41.2100182545423
+ ],
+ [
+ -73.05065,
+ 41.210197
+ ],
+ [
+ -73.0549471812157,
+ 41.2084682489362
+ ],
+ [
+ -73.05935,
+ 41.206697
+ ],
+ [
+ -73.065858,
+ 41.197761
+ ],
+ [
+ -73.0727826240098,
+ 41.195950868786696
+ ],
+ [
+ -73.0734402634471,
+ 41.1957789585616
+ ],
+ [
+ -73.0797045507602,
+ 41.1941414426504
+ ],
+ [
+ -73.08015,
+ 41.194025
+ ],
+ [
+ -73.0808050495963,
+ 41.19349981918089
+ ],
+ [
+ -73.0825817681282,
+ 41.192075349187895
+ ],
+ [
+ -73.0868891076424,
+ 41.188621973890896
+ ],
+ [
+ -73.087842,
+ 41.187858
+ ],
+ [
+ -73.090506659504,
+ 41.184872937676296
+ ],
+ [
+ -73.0926742624665,
+ 41.182444698748796
+ ],
+ [
+ -73.0933567669717,
+ 41.1816801288362
+ ],
+ [
+ -73.097115,
+ 41.17747
+ ],
+ [
+ -73.0989503366726,
+ 41.175941950166404
+ ],
+ [
+ -73.101493,
+ 41.173825
+ ],
+ [
+ -73.103288,
+ 41.174076
+ ],
+ [
+ -73.1042935661222,
+ 41.173187672693004
+ ],
+ [
+ -73.105458,
+ 41.172159
+ ],
+ [
+ -73.1058061668315,
+ 41.1716950509516
+ ],
+ [
+ -73.108005,
+ 41.168765
+ ],
+ [
+ -73.1080084493287,
+ 41.1687516729814
+ ],
+ [
+ -73.110352,
+ 41.159697
+ ],
+ [
+ -73.107039,
+ 41.155529
+ ],
+ [
+ -73.10109,
+ 41.154141
+ ],
+ [
+ -73.10302,
+ 41.151412
+ ],
+ [
+ -73.111052,
+ 41.150797
+ ],
+ [
+ -73.1131343452713,
+ 41.1503632006622
+ ],
+ [
+ -73.130253,
+ 41.146797
+ ],
+ [
+ -73.1378606558334,
+ 41.149023812356496
+ ],
+ [
+ -73.1647956314162,
+ 41.156907862024596
+ ],
+ [
+ -73.172196,
+ 41.159074
+ ],
+ [
+ -73.170701,
+ 41.164945
+ ],
+ [
+ -73.175855,
+ 41.1662216588435
+ ],
+ [
+ -73.177774,
+ 41.166697
+ ],
+ [
+ -73.1815928017535,
+ 41.165377092210896
+ ],
+ [
+ -73.18181385503829,
+ 41.1653006886762
+ ],
+ [
+ -73.184359,
+ 41.164421
+ ],
+ [
+ -73.1846121599728,
+ 41.163709602462895
+ ],
+ [
+ -73.186186,
+ 41.159287
+ ],
+ [
+ -73.202656,
+ 41.158096
+ ],
+ [
+ -73.213994,
+ 41.149624
+ ],
+ [
+ -73.216818,
+ 41.141488
+ ],
+ [
+ -73.2215700691572,
+ 41.1419492533799
+ ],
+ [
+ -73.228295,
+ 41.142602
+ ],
+ [
+ -73.2348411938807,
+ 41.143951311588005
+ ],
+ [
+ -73.235058,
+ 41.143996
+ ],
+ [
+ -73.2351985506033,
+ 41.143700126657194
+ ],
+ [
+ -73.2354744452279,
+ 41.1431193403574
+ ],
+ [
+ -73.2378387321871,
+ 41.138142275376005
+ ],
+ [
+ -73.242565,
+ 41.128193
+ ],
+ [
+ -73.24292234354029,
+ 41.12799987597379
+ ],
+ [
+ -73.262358,
+ 41.117496
+ ],
+ [
+ -73.2684906684439,
+ 41.118659586425004
+ ],
+ [
+ -73.274127,
+ 41.119729
+ ],
+ [
+ -73.277713,
+ 41.124041
+ ],
+ [
+ -73.286319367717,
+ 41.127708648413595
+ ],
+ [
+ -73.286759,
+ 41.127896
+ ],
+ [
+ -73.296359,
+ 41.125696
+ ],
+ [
+ -73.29745864725889,
+ 41.1238300360574
+ ],
+ [
+ -73.2975262590239,
+ 41.123715307343694
+ ],
+ [
+ -73.2976901854783,
+ 41.12343714464149
+ ],
+ [
+ -73.299559,
+ 41.120266
+ ],
+ [
+ -73.30664,
+ 41.116522
+ ],
+ [
+ -73.308829,
+ 41.11382
+ ],
+ [
+ -73.31186,
+ 41.116296
+ ],
+ [
+ -73.3176646238028,
+ 41.11619628040359
+ ],
+ [
+ -73.3192115774442,
+ 41.1161697047636
+ ],
+ [
+ -73.320475,
+ 41.116148
+ ],
+ [
+ -73.3228355447183,
+ 41.1147221707308
+ ],
+ [
+ -73.32861342197128,
+ 41.1112321853739
+ ],
+ [
+ -73.33066,
+ 41.109996
+ ],
+ [
+ -73.330957221598,
+ 41.1100872499775
+ ],
+ [
+ -73.3310755801918,
+ 41.1101235872393
+ ],
+ [
+ -73.336409,
+ 41.111761
+ ],
+ [
+ -73.34722026487249,
+ 41.1075859999947
+ ],
+ [
+ -73.350351,
+ 41.106377
+ ],
+ [
+ -73.352671,
+ 41.101611
+ ],
+ [
+ -73.357078,
+ 41.103791
+ ],
+ [
+ -73.368249,
+ 41.107194
+ ],
+ [
+ -73.3680613466089,
+ 41.1028164721535
+ ],
+ [
+ -73.368011,
+ 41.101642
+ ],
+ [
+ -73.365396,
+ 41.097343
+ ],
+ [
+ -73.369199,
+ 41.095552
+ ],
+ [
+ -73.382787,
+ 41.0954
+ ],
+ [
+ -73.379693,
+ 41.090455
+ ],
+ [
+ -73.381028,
+ 41.088802
+ ],
+ [
+ -73.383662,
+ 41.089798000895
+ ],
+ [
+ -73.387732,
+ 41.091337
+ ],
+ [
+ -73.392162,
+ 41.087696
+ ],
+ [
+ -73.3923500607244,
+ 41.0863926574146
+ ],
+ [
+ -73.392967,
+ 41.082117
+ ],
+ [
+ -73.398196,
+ 41.081938
+ ],
+ [
+ -73.402474,
+ 41.086058
+ ],
+ [
+ -73.40259532129939,
+ 41.085912130154
+ ],
+ [
+ -73.405632,
+ 41.082261
+ ],
+ [
+ -73.40785,
+ 41.081115
+ ],
+ [
+ -73.407228,
+ 41.075488
+ ],
+ [
+ -73.408416,
+ 41.071008
+ ],
+ [
+ -73.412932,
+ 41.071008
+ ],
+ [
+ -73.42199635917109,
+ 41.0642269064179
+ ],
+ [
+ -73.43325,
+ 41.055808
+ ],
+ [
+ -73.435063,
+ 41.056696
+ ],
+ [
+ -73.438152,
+ 41.055515
+ ],
+ [
+ -73.440841,
+ 41.055863
+ ],
+ [
+ -73.443694,
+ 41.057633
+ ],
+ [
+ -73.4466868081709,
+ 41.0573920497769
+ ],
+ [
+ -73.450364,
+ 41.057096
+ ],
+ [
+ -73.45063655445911,
+ 41.056842633680795
+ ],
+ [
+ -73.458915,
+ 41.049147
+ ],
+ [
+ -73.468239,
+ 41.051347
+ ],
+ [
+ -73.476155,
+ 41.044304
+ ],
+ [
+ -73.477364,
+ 41.035997
+ ],
+ [
+ -73.489759,
+ 41.039965
+ ],
+ [
+ -73.4916102435144,
+ 41.044223690237196
+ ],
+ [
+ -73.493327,
+ 41.048173
+ ],
+ [
+ -73.4956630331328,
+ 41.046784198678196
+ ],
+ [
+ -73.505865,
+ 41.040719
+ ],
+ [
+ -73.505865,
+ 41.034265
+ ],
+ [
+ -73.516872115002,
+ 41.0387254842729
+ ],
+ [
+ -73.516903,
+ 41.038738
+ ],
+ [
+ -73.52118110266501,
+ 41.0377344944366
+ ],
+ [
+ -73.5228860701339,
+ 41.0373345637957
+ ],
+ [
+ -73.522978,
+ 41.037313
+ ],
+ [
+ -73.52260290071469,
+ 41.036216313084
+ ],
+ [
+ -73.521077,
+ 41.031755
+ ],
+ [
+ -73.5205949647912,
+ 41.03150252134039
+ ],
+ [
+ -73.517156641692,
+ 41.029701608893696
+ ],
+ [
+ -73.516766,
+ 41.029497
+ ],
+ [
+ -73.51880927306568,
+ 41.0259645618187
+ ],
+ [
+ -73.52066508323459,
+ 41.0227562120351
+ ],
+ [
+ -73.522370507094,
+ 41.0198078521426
+ ],
+ [
+ -73.522666,
+ 41.019297
+ ],
+ [
+ -73.528866,
+ 41.016397
+ ],
+ [
+ -73.5292185791445,
+ 41.0172423938497
+ ],
+ [
+ -73.531169,
+ 41.021919
+ ],
+ [
+ -73.530189,
+ 41.028776
+ ],
+ [
+ -73.532786,
+ 41.03167
+ ],
+ [
+ -73.53441008767169,
+ 41.03182909949759
+ ],
+ [
+ -73.535338,
+ 41.03192
+ ],
+ [
+ -73.53666784610779,
+ 41.031069245395194
+ ],
+ [
+ -73.53880634442169,
+ 41.0297011643238
+ ],
+ [
+ -73.53990309676739,
+ 41.0289995289219
+ ],
+ [
+ -73.544845,
+ 41.025838
+ ],
+ [
+ -73.547436,
+ 41.022881
+ ],
+ [
+ -73.551494,
+ 41.024336
+ ],
+ [
+ -73.552870490795,
+ 41.0233452383279
+ ],
+ [
+ -73.55644,
+ 41.020776
+ ],
+ [
+ -73.557168,
+ 41.017158
+ ],
+ [
+ -73.561968,
+ 41.016797
+ ],
+ [
+ -73.56394582303349,
+ 41.01474977966701
+ ],
+ [
+ -73.567668,
+ 41.010897
+ ],
+ [
+ -73.570068,
+ 41.001597
+ ],
+ [
+ -73.583968,
+ 41.000897
+ ],
+ [
+ -73.585115,
+ 41.005464
+ ],
+ [
+ -73.58760717194349,
+ 41.0076083911386
+ ],
+ [
+ -73.5876450291519,
+ 41.0076409654007
+ ],
+ [
+ -73.58765810889219,
+ 41.0076522198727
+ ],
+ [
+ -73.593191,
+ 41.012413
+ ],
+ [
+ -73.595699,
+ 41.015995
+ ],
+ [
+ -73.59674205686649,
+ 41.0158760715483
+ ],
+ [
+ -73.603952,
+ 41.015054
+ ],
+ [
+ -73.614722,
+ 41.008801
+ ],
+ [
+ -73.619487022323,
+ 41.0077142895964
+ ],
+ [
+ -73.624943,
+ 41.00647
+ ],
+ [
+ -73.627086,
+ 41.001809
+ ],
+ [
+ -73.639885,
+ 41.003118
+ ],
+ [
+ -73.6410127012996,
+ 41.0022674354848
+ ],
+ [
+ -73.6422681924053,
+ 41.0013204859831
+ ],
+ [
+ -73.643653,
+ 41.000276
+ ],
+ [
+ -73.6487877738617,
+ 40.996830745589
+ ],
+ [
+ -73.651175,
+ 40.995229
+ ],
+ [
+ -73.6518688939799,
+ 40.9940961992129
+ ],
+ [
+ -73.653722054959,
+ 40.9910708635323
+ ],
+ [
+ -73.656829806646,
+ 40.9859973744123
+ ],
+ [
+ -73.657336,
+ 40.985171
+ ],
+ [
+ -73.6576158881351,
+ 40.98549919431
+ ],
+ [
+ -73.659671,
+ 40.987909
+ ],
+ [
+ -73.657228,
+ 40.990914
+ ],
+ [
+ -73.659639,
+ 40.994339
+ ],
+ [
+ -73.65950070028201,
+ 40.995525863034
+ ],
+ [
+ -73.659309,
+ 40.997171
+ ],
+ [
+ -73.660268,
+ 41.000484
+ ],
+ [
+ -73.6585172688616,
+ 41.003999208203
+ ],
+ [
+ -73.6585107167126,
+ 41.00401236394519
+ ],
+ [
+ -73.6579245992895,
+ 41.0051892007126
+ ],
+ [
+ -73.656065,
+ 41.008923
+ ],
+ [
+ -73.6556887421582,
+ 41.01026045050809
+ ],
+ [
+ -73.655241,
+ 41.011852
+ ],
+ [
+ -73.655255,
+ 41.012246
+ ],
+ [
+ -73.655331976322,
+ 41.0123253874133
+ ],
+ [
+ -73.65566792918719,
+ 41.012671863164094
+ ],
+ [
+ -73.656117,
+ 41.013135
+ ],
+ [
+ -73.658679,
+ 41.016706
+ ],
+ [
+ -73.6604129558331,
+ 41.0183522375566
+ ],
+ [
+ -73.662672,
+ 41.020497
+ ],
+ [
+ -73.66655447294119,
+ 41.025275428235304
+ ],
+ [
+ -73.66672215108149,
+ 41.0254818013311
+ ],
+ [
+ -73.670472,
+ 41.030097
+ ],
+ [
+ -73.6722427528981,
+ 41.0322775924543
+ ],
+ [
+ -73.6757716832468,
+ 41.0366232913364
+ ],
+ [
+ -73.67578635991521,
+ 41.0366413649098
+ ],
+ [
+ -73.679973,
+ 41.041797
+ ],
+ [
+ -73.687173,
+ 41.050697
+ ],
+ [
+ -73.6895100450317,
+ 41.05352745777849
+ ],
+ [
+ -73.694273,
+ 41.059296
+ ],
+ [
+ -73.70616305989901,
+ 41.074183562832594
+ ],
+ [
+ -73.716875,
+ 41.087596
+ ],
+ [
+ -73.722575,
+ 41.093596
+ ],
+ [
+ -73.727775,
+ 41.100696
+ ]
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/crude_albany_geojson.json b/tests/data/crude_albany_geojson.json
new file mode 100644
index 00000000..9445b0ed
--- /dev/null
+++ b/tests/data/crude_albany_geojson.json
@@ -0,0 +1,36 @@
+{
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ -73.76907348632812,
+ 42.61678083779763
+ ],
+ [
+ -73.71551513671875,
+ 42.69303463329987
+ ],
+ [
+ -73.87687683105469,
+ 42.73036990242392
+ ],
+ [
+ -73.92013549804688,
+ 42.70464124398721
+ ],
+ [
+ -73.82194519042969,
+ 42.68193062780271
+ ],
+ [
+ -73.85627746582031,
+ 42.6294120967892
+ ],
+ [
+ -73.76907348632812,
+ 42.61678083779763
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/crude_kings_county_geojson.json b/tests/data/crude_kings_county_geojson.json
new file mode 100644
index 00000000..6f7e9bed
--- /dev/null
+++ b/tests/data/crude_kings_county_geojson.json
@@ -0,0 +1,54 @@
+{
+ "type": "MultiPolygon",
+ "coordinates": [
+ [
+ [
+ [
+ -73.9517,
+ 40.741
+ ],
+ [
+ -73.897,
+ 40.6808
+ ],
+ [
+ -73.8696,
+ 40.6972
+ ],
+ [
+ -73.8313,
+ 40.6315
+ ],
+ [
+ -73.8477,
+ 40.5877
+ ],
+ [
+ -73.9408,
+ 40.5658
+ ],
+ [
+ -74.012,
+ 40.5767
+ ],
+ [
+ -74.0449,
+ 40.626
+ ],
+ [
+ -74.0229,
+ 40.6808
+ ],
+ [
+ -73.9627,
+ 40.7355
+ ],
+ [
+ -73.9517,
+ 40.741
+ ]
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/crude_new_york_county_geojson.json b/tests/data/crude_new_york_county_geojson.json
new file mode 100644
index 00000000..79eef251
--- /dev/null
+++ b/tests/data/crude_new_york_county_geojson.json
@@ -0,0 +1,60 @@
+{
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ -74.01969909667969,
+ 40.704586878965245
+ ],
+ [
+ -74.01901245117188,
+ 40.70250471166452
+ ],
+ [
+ -74.0093994140625,
+ 40.70250471166452
+ ],
+ [
+ -73.97575378417967,
+ 40.71239442660529
+ ],
+ [
+ -73.96957397460938,
+ 40.72852712420599
+ ],
+ [
+ -73.97300720214844,
+ 40.73893324113601
+ ],
+ [
+ -73.94485473632812,
+ 40.773261878622634
+ ],
+ [
+ -73.92837524414061,
+ 40.79665760379586
+ ],
+ [
+ -73.93867492675781,
+ 40.833034570951135
+ ],
+ [
+ -73.90846252441406,
+ 40.8725069777884
+ ],
+ [
+ -73.92768859863281,
+ 40.87821814104651
+ ],
+ [
+ -74.01145935058594,
+ 40.751418432997454
+ ],
+ [
+ -74.01969909667969,
+ 40.704586878965245
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/crude_us_geojson.json b/tests/data/crude_us_geojson.json
new file mode 100644
index 00000000..ee69109f
--- /dev/null
+++ b/tests/data/crude_us_geojson.json
@@ -0,0 +1,144 @@
+{
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ -88.330078125,
+ 48.80686346108517
+ ],
+ [
+ -123.8818359375,
+ 49.35375571830993
+ ],
+ [
+ -125.5517578125,
+ 48.42920055556841
+ ],
+ [
+ -124.49707031249999,
+ 38.58252615935333
+ ],
+ [
+ -121.9482421875,
+ 34.70549341022544
+ ],
+ [
+ -118.38867187500001,
+ 32.21280106801518
+ ],
+ [
+ -116.19140625,
+ 32.10118973232094
+ ],
+ [
+ -111.62109375,
+ 30.826780904779774
+ ],
+ [
+ -106.875,
+ 30.44867367928756
+ ],
+ [
+ -105.029296875,
+ 28.844673680771795
+ ],
+ [
+ -101.689453125,
+ 28.76765910569123
+ ],
+ [
+ -100.6787109375,
+ 26.82407078047018
+ ],
+ [
+ -96.7236328125,
+ 24.966140159912975
+ ],
+ [
+ -96.767578125,
+ 27.254629577800063
+ ],
+ [
+ -94.4384765625,
+ 28.613459424004414
+ ],
+ [
+ -89.20898437499999,
+ 28.304380682962783
+ ],
+ [
+ -88.3740234375,
+ 29.649868677972304
+ ],
+ [
+ -84.3310546875,
+ 29.152161283318915
+ ],
+ [
+ -81.5185546875,
+ 24.086589258228027
+ ],
+ [
+ -79.4970703125,
+ 25.60190226111573
+ ],
+ [
+ -80.68359375,
+ 30.713503990354965
+ ],
+ [
+ -75.1904296875,
+ 34.813803317113155
+ ],
+ [
+ -75.146484375,
+ 36.77409249464195
+ ],
+ [
+ -73.47656249999999,
+ 39.57182223734374
+ ],
+ [
+ -69.521484375,
+ 41.1455697310095
+ ],
+ [
+ -70.048828125,
+ 43.03677585761058
+ ],
+ [
+ -66.62109375,
+ 44.308126684886126
+ ],
+ [
+ -67.1484375,
+ 46.70973594407157
+ ],
+ [
+ -68.5986328125,
+ 48.019324184801185
+ ],
+ [
+ -74.970703125,
+ 45.521743896993634
+ ],
+ [
+ -79.9365234375,
+ 42.87596410238256
+ ],
+ [
+ -82.177734375,
+ 41.80407814427234
+ ],
+ [
+ -81.298828125,
+ 45.089035564831036
+ ],
+ [
+ -88.330078125,
+ 48.80686346108517
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/ct_state_geojson.json b/tests/data/ct_state_geojson.json
new file mode 100644
index 00000000..5de79e12
--- /dev/null
+++ b/tests/data/ct_state_geojson.json
@@ -0,0 +1,3962 @@
+{
+ "type": "MultiPolygon",
+ "coordinates": [
+ [
+ [
+ [
+ -72.761427,
+ 41.242333
+ ],
+ [
+ -72.759733,
+ 41.248454
+ ],
+ [
+ -72.75886,
+ 41.253843
+ ],
+ [
+ -72.756353,
+ 41.25548
+ ],
+ [
+ -72.754658,
+ 41.255929
+ ],
+ [
+ -72.747678,
+ 41.255855
+ ],
+ [
+ -72.740299,
+ 41.256454
+ ],
+ [
+ -72.740099,
+ 41.255105
+ ],
+ [
+ -72.741058,
+ 41.252691
+ ],
+ [
+ -72.742891,
+ 41.252631
+ ],
+ [
+ -72.745484,
+ 41.250982
+ ],
+ [
+ -72.745661,
+ 41.249723
+ ],
+ [
+ -72.749871,
+ 41.247308
+ ],
+ [
+ -72.755655,
+ 41.245059
+ ],
+ [
+ -72.757135,
+ 41.244305
+ ],
+ [
+ -72.75966,
+ 41.242012
+ ],
+ [
+ -72.760341,
+ 41.241235
+ ],
+ [
+ -72.761427,
+ 41.242333
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.364244,
+ 41.088945
+ ],
+ [
+ -73.361764,
+ 41.087508
+ ],
+ [
+ -73.360334,
+ 41.085711
+ ],
+ [
+ -73.358808,
+ 41.086645
+ ],
+ [
+ -73.356901,
+ 41.087077
+ ],
+ [
+ -73.353754,
+ 41.087508
+ ],
+ [
+ -73.354231,
+ 41.085639
+ ],
+ [
+ -73.355089,
+ 41.083483
+ ],
+ [
+ -73.357664,
+ 41.081973
+ ],
+ [
+ -73.360141,
+ 41.08202
+ ],
+ [
+ -73.363767,
+ 41.083626
+ ],
+ [
+ -73.369775,
+ 41.088802
+ ],
+ [
+ -73.364244,
+ 41.088945
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.394189,
+ 41.067379
+ ],
+ [
+ -73.392281,
+ 41.07083
+ ],
+ [
+ -73.388181,
+ 41.073275
+ ],
+ [
+ -73.383662,
+ 41.072500293771796
+ ],
+ [
+ -73.381887,
+ 41.072196
+ ],
+ [
+ -73.381314,
+ 41.070686
+ ],
+ [
+ -73.3835825294851,
+ 41.0694191474177
+ ],
+ [
+ -73.383889,
+ 41.069248
+ ],
+ [
+ -73.386655,
+ 41.066301
+ ],
+ [
+ -73.389993,
+ 41.064287
+ ],
+ [
+ -73.38799,
+ 41.061052
+ ],
+ [
+ -73.385797,
+ 41.059757
+ ],
+ [
+ -73.386178,
+ 41.058391
+ ],
+ [
+ -73.387227,
+ 41.058247
+ ],
+ [
+ -73.391805,
+ 41.061411
+ ],
+ [
+ -73.395238,
+ 41.064431
+ ],
+ [
+ -73.394189,
+ 41.067379
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.416886,
+ 41.053932
+ ],
+ [
+ -73.404774,
+ 41.06213
+ ],
+ [
+ -73.399815,
+ 41.062418
+ ],
+ [
+ -73.399148,
+ 41.06098
+ ],
+ [
+ -73.401055,
+ 41.0576
+ ],
+ [
+ -73.401532,
+ 41.053717
+ ],
+ [
+ -73.406077,
+ 41.052361
+ ],
+ [
+ -73.409542,
+ 41.052998
+ ],
+ [
+ -73.422165,
+ 41.047562
+ ],
+ [
+ -73.416886,
+ 41.053932
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.613369,
+ 40.988883
+ ],
+ [
+ -73.611501,
+ 40.990011
+ ],
+ [
+ -73.609727,
+ 40.990786
+ ],
+ [
+ -73.608327,
+ 40.990786
+ ],
+ [
+ -73.607569,
+ 40.990397
+ ],
+ [
+ -73.608233,
+ 40.989659
+ ],
+ [
+ -73.609634,
+ 40.988742
+ ],
+ [
+ -73.612528,
+ 40.987474
+ ],
+ [
+ -73.613369,
+ 40.988883
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.630573,
+ 40.980707
+ ],
+ [
+ -73.62948,
+ 40.983646
+ ],
+ [
+ -73.626647,
+ 40.983049
+ ],
+ [
+ -73.623765,
+ 40.984696
+ ],
+ [
+ -73.622717,
+ 40.984559
+ ],
+ [
+ -73.621865,
+ 40.98247
+ ],
+ [
+ -73.622799,
+ 40.982047
+ ],
+ [
+ -73.623609,
+ 40.982138
+ ],
+ [
+ -73.625127,
+ 40.981213
+ ],
+ [
+ -73.626813,
+ 40.981906
+ ],
+ [
+ -73.627841,
+ 40.981483
+ ],
+ [
+ -73.628968,
+ 40.980685
+ ],
+ [
+ -73.630081,
+ 40.980144
+ ],
+ [
+ -73.630573,
+ 40.980707
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.645767,
+ 40.996001
+ ],
+ [
+ -73.644485,
+ 40.997605
+ ],
+ [
+ -73.644289,
+ 40.998289
+ ],
+ [
+ -73.642966,
+ 40.997833
+ ],
+ [
+ -73.640451,
+ 40.99464
+ ],
+ [
+ -73.639325,
+ 40.994028
+ ],
+ [
+ -73.638435,
+ 40.994092
+ ],
+ [
+ -73.637667,
+ 40.993249
+ ],
+ [
+ -73.637457,
+ 40.992196
+ ],
+ [
+ -73.639509,
+ 40.991329
+ ],
+ [
+ -73.639147,
+ 40.989542
+ ],
+ [
+ -73.640819,
+ 40.989236
+ ],
+ [
+ -73.64141,
+ 40.99061
+ ],
+ [
+ -73.642594,
+ 40.991597
+ ],
+ [
+ -73.644725,
+ 40.995606
+ ],
+ [
+ -73.645767,
+ 40.996001
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.727775,
+ 41.100696
+ ],
+ [
+ -73.6960060114926,
+ 41.1154076779464
+ ],
+ [
+ -73.6959488909347,
+ 41.1154341295047
+ ],
+ [
+ -73.6684334021286,
+ 41.128176084123695
+ ],
+ [
+ -73.660504402926,
+ 41.1318478687221
+ ],
+ [
+ -73.639672,
+ 41.141495
+ ],
+ [
+ -73.633975019844,
+ 41.144090804497196
+ ],
+ [
+ -73.632153,
+ 41.144921
+ ],
+ [
+ -73.62881485864709,
+ 41.1464233424058
+ ],
+ [
+ -73.61439109108869,
+ 41.152914810371
+ ],
+ [
+ -73.59706988473059,
+ 41.160710280988205
+ ],
+ [
+ -73.58745411116449,
+ 41.1650378941317
+ ],
+ [
+ -73.5861737573394,
+ 41.1656141219312
+ ],
+ [
+ -73.564941,
+ 41.17517
+ ],
+ [
+ -73.5647586708229,
+ 41.1752542879337
+ ],
+ [
+ -73.55465007369439,
+ 41.1799273346628
+ ],
+ [
+ -73.535995955855,
+ 41.1885508422818
+ ],
+ [
+ -73.514617,
+ 41.198434
+ ],
+ [
+ -73.5127650458268,
+ 41.1992931912149
+ ],
+ [
+ -73.509487,
+ 41.200814
+ ],
+ [
+ -73.5091865006584,
+ 41.2009480565066
+ ],
+ [
+ -73.50918279309809,
+ 41.2009497104956
+ ],
+ [
+ -73.50394659256919,
+ 41.2032856449013
+ ],
+ [
+ -73.4959359310458,
+ 41.206859300983105
+ ],
+ [
+ -73.4849111933569,
+ 41.2117775740592
+ ],
+ [
+ -73.482709,
+ 41.21276
+ ],
+ [
+ -73.5025525269551,
+ 41.237211341315195
+ ],
+ [
+ -73.51742744494929,
+ 41.255540325761004
+ ],
+ [
+ -73.518384,
+ 41.256719
+ ],
+ [
+ -73.5251605899493,
+ 41.2647699058786
+ ],
+ [
+ -73.5405370946926,
+ 41.2830379128492
+ ],
+ [
+ -73.5481483879656,
+ 41.292080485325
+ ],
+ [
+ -73.550961,
+ 41.295422
+ ],
+ [
+ -73.54994114379718,
+ 41.3015331068529
+ ],
+ [
+ -73.5494473159631,
+ 41.304492185449796
+ ],
+ [
+ -73.5490532504887,
+ 41.3068534754184
+ ],
+ [
+ -73.548929,
+ 41.307598
+ ],
+ [
+ -73.549574,
+ 41.315931
+ ],
+ [
+ -73.548973,
+ 41.326297
+ ],
+ [
+ -73.5485869686171,
+ 41.329941609131396
+ ],
+ [
+ -73.5452425041353,
+ 41.3615174507099
+ ],
+ [
+ -73.544728,
+ 41.366375
+ ],
+ [
+ -73.5437226736843,
+ 41.3742810466284
+ ],
+ [
+ -73.54361929444839,
+ 41.3750940374418
+ ],
+ [
+ -73.543425,
+ 41.376622
+ ],
+ [
+ -73.5434148559124,
+ 41.3767540709835
+ ],
+ [
+ -73.5424417770279,
+ 41.3894230749715
+ ],
+ [
+ -73.5423794810464,
+ 41.3902341377244
+ ],
+ [
+ -73.5412239838369,
+ 41.40527813774089
+ ],
+ [
+ -73.541169,
+ 41.405994
+ ],
+ [
+ -73.537673,
+ 41.433905
+ ],
+ [
+ -73.537469,
+ 41.43589
+ ],
+ [
+ -73.5372747912126,
+ 41.4379113250589
+ ],
+ [
+ -73.53710227334909,
+ 41.4397068909828
+ ],
+ [
+ -73.536969,
+ 41.441094
+ ],
+ [
+ -73.536067,
+ 41.451331
+ ],
+ [
+ -73.5360668139182,
+ 41.451334972042694
+ ],
+ [
+ -73.535986,
+ 41.45306
+ ],
+ [
+ -73.53589433801501,
+ 41.455034816626295
+ ],
+ [
+ -73.535885,
+ 41.455236
+ ],
+ [
+ -73.535857,
+ 41.455709
+ ],
+ [
+ -73.535769,
+ 41.457159
+ ],
+ [
+ -73.53529546019818,
+ 41.463495977276594
+ ],
+ [
+ -73.53475984465959,
+ 41.47066366093001
+ ],
+ [
+ -73.534369,
+ 41.475894
+ ],
+ [
+ -73.534269,
+ 41.476394
+ ],
+ [
+ -73.534269,
+ 41.476911
+ ],
+ [
+ -73.53415,
+ 41.47806
+ ],
+ [
+ -73.5340642743096,
+ 41.4788793571253
+ ],
+ [
+ -73.534055,
+ 41.478968
+ ],
+ [
+ -73.533969,
+ 41.479693
+ ],
+ [
+ -73.53241775653869,
+ 41.4985770634688
+ ],
+ [
+ -73.532406621006,
+ 41.4987126218851
+ ],
+ [
+ -73.5308863930724,
+ 41.517219117803194
+ ],
+ [
+ -73.5306372297182,
+ 41.5202523080875
+ ],
+ [
+ -73.530067,
+ 41.527194
+ ],
+ [
+ -73.5274208272509,
+ 41.554335593944195
+ ],
+ [
+ -73.52572611024829,
+ 41.571718178187396
+ ],
+ [
+ -73.521041,
+ 41.619773
+ ],
+ [
+ -73.520017,
+ 41.641197
+ ],
+ [
+ -73.51823760355249,
+ 41.666733981689404
+ ],
+ [
+ -73.5179500508434,
+ 41.670860790123
+ ],
+ [
+ -73.516785,
+ 41.687581
+ ],
+ [
+ -73.5165907759759,
+ 41.689711714211896
+ ],
+ [
+ -73.5159914638673,
+ 41.6962864046138
+ ],
+ [
+ -73.511921,
+ 41.740941
+ ],
+ [
+ -73.51190654632549,
+ 41.741209115662095
+ ],
+ [
+ -73.5115449368014,
+ 41.747916972334295
+ ],
+ [
+ -73.510961,
+ 41.758749
+ ],
+ [
+ -73.5079601692712,
+ 41.7915267620213
+ ],
+ [
+ -73.505008,
+ 41.823773
+ ],
+ [
+ -73.5049921230769,
+ 41.823900015384595
+ ],
+ [
+ -73.504944,
+ 41.824285
+ ],
+ [
+ -73.501984,
+ 41.858717
+ ],
+ [
+ -73.5009108171378,
+ 41.868571326657005
+ ],
+ [
+ -73.5009100939961,
+ 41.86857796678739
+ ],
+ [
+ -73.49945941077141,
+ 41.8818986289734
+ ],
+ [
+ -73.498304,
+ 41.892508
+ ],
+ [
+ -73.4965646487039,
+ 41.921747111939
+ ],
+ [
+ -73.496527,
+ 41.92238
+ ],
+ [
+ -73.49348450212139,
+ 41.953339471656
+ ],
+ [
+ -73.492975,
+ 41.958524
+ ],
+ [
+ -73.489615,
+ 42.000092
+ ],
+ [
+ -73.48822382860538,
+ 42.0300472272559
+ ],
+ [
+ -73.487314,
+ 42.049638
+ ],
+ [
+ -73.4367436437709,
+ 42.050518541412494
+ ],
+ [
+ -73.432812,
+ 42.050587
+ ],
+ [
+ -73.4261741938809,
+ 42.0504141864309
+ ],
+ [
+ -73.3406383205113,
+ 42.0481872820452
+ ],
+ [
+ -73.32773083156711,
+ 42.047851238902105
+ ],
+ [
+ -73.3256265850805,
+ 42.047796455387896
+ ],
+ [
+ -73.2962651552155,
+ 42.047032038139804
+ ],
+ [
+ -73.29442,
+ 42.046984
+ ],
+ [
+ -73.293097,
+ 42.04694
+ ],
+ [
+ -73.23333604778209,
+ 42.0450183175694
+ ],
+ [
+ -73.2329587822323,
+ 42.04500618616
+ ],
+ [
+ -73.231056,
+ 42.044945
+ ],
+ [
+ -73.229798,
+ 42.044877
+ ],
+ [
+ -73.17222083816989,
+ 42.04324110728349
+ ],
+ [
+ -73.12727608992209,
+ 42.0419641289823
+ ],
+ [
+ -73.053254,
+ 42.039861
+ ],
+ [
+ -73.00874486852759,
+ 42.03885984497129
+ ],
+ [
+ -72.999549,
+ 42.038653
+ ],
+ [
+ -72.97899983673081,
+ 42.038510322694194
+ ],
+ [
+ -72.863733,
+ 42.03771
+ ],
+ [
+ -72.863619,
+ 42.037709
+ ],
+ [
+ -72.847142,
+ 42.036894
+ ],
+ [
+ -72.8348899331935,
+ 42.036748146402694
+ ],
+ [
+ -72.813541,
+ 42.036494
+ ],
+ [
+ -72.816741,
+ 41.997595
+ ],
+ [
+ -72.79493113970959,
+ 41.999950370696496
+ ],
+ [
+ -72.77475678567849,
+ 42.002129113782196
+ ],
+ [
+ -72.770521087532,
+ 42.0025865508845
+ ],
+ [
+ -72.766739,
+ 42.002995
+ ],
+ [
+ -72.7663047683742,
+ 42.006396481069004
+ ],
+ [
+ -72.766139,
+ 42.007695
+ ],
+ [
+ -72.763265,
+ 42.009742
+ ],
+ [
+ -72.763238,
+ 42.012795
+ ],
+ [
+ -72.761238,
+ 42.014595
+ ],
+ [
+ -72.759738,
+ 42.016995
+ ],
+ [
+ -72.761354,
+ 42.018183
+ ],
+ [
+ -72.76231,
+ 42.019775
+ ],
+ [
+ -72.762151,
+ 42.021527
+ ],
+ [
+ -72.760558,
+ 42.021846
+ ],
+ [
+ -72.758151,
+ 42.020865
+ ],
+ [
+ -72.757467,
+ 42.020947
+ ],
+ [
+ -72.754038,
+ 42.025395
+ ],
+ [
+ -72.751738,
+ 42.030195
+ ],
+ [
+ -72.753538,
+ 42.032095
+ ],
+ [
+ -72.757538,
+ 42.033295
+ ],
+ [
+ -72.755838,
+ 42.036195
+ ],
+ [
+ -72.7516053156989,
+ 42.0362368951743
+ ],
+ [
+ -72.71916366349859,
+ 42.0365580031471
+ ],
+ [
+ -72.7141341571442,
+ 42.0366077852784
+ ],
+ [
+ -72.71278280191339,
+ 42.036621161013194
+ ],
+ [
+ -72.6994515854077,
+ 42.036753113599396
+ ],
+ [
+ -72.695927,
+ 42.036788
+ ],
+ [
+ -72.68608011133279,
+ 42.035968622773595
+ ],
+ [
+ -72.6729633546716,
+ 42.034877153980105
+ ],
+ [
+ -72.643134,
+ 42.032395
+ ],
+ [
+ -72.61690909138659,
+ 42.0312029925632
+ ],
+ [
+ -72.61690467080379,
+ 42.0312027916334
+ ],
+ [
+ -72.607933,
+ 42.030795
+ ],
+ [
+ -72.606933,
+ 42.024995
+ ],
+ [
+ -72.590233,
+ 42.024695
+ ],
+ [
+ -72.589829,
+ 42.024695
+ ],
+ [
+ -72.582332,
+ 42.024695
+ ],
+ [
+ -72.5742849478112,
+ 42.029510322076696
+ ],
+ [
+ -72.573231,
+ 42.030141
+ ],
+ [
+ -72.5634267784983,
+ 42.031044031842995
+ ],
+ [
+ -72.560977008977,
+ 42.03126967136829
+ ],
+ [
+ -72.56088807309929,
+ 42.031277862934495
+ ],
+ [
+ -72.5529908645778,
+ 42.0320052466196
+ ],
+ [
+ -72.55285820422401,
+ 42.032017465491194
+ ],
+ [
+ -72.5501111622106,
+ 42.032270485724496
+ ],
+ [
+ -72.5315724231202,
+ 42.0339780228017
+ ],
+ [
+ -72.5281470614453,
+ 42.0342935206376
+ ],
+ [
+ -72.528131,
+ 42.034295
+ ],
+ [
+ -72.50919168706001,
+ 42.0342165401236
+ ],
+ [
+ -72.4597281051111,
+ 42.0340116273826
+ ],
+ [
+ -72.4596911701656,
+ 42.0340114743722
+ ],
+ [
+ -72.4581852392999,
+ 42.034005235753604
+ ],
+ [
+ -72.45668,
+ 42.033999
+ ],
+ [
+ -72.44163978907079,
+ 42.033773502470595
+ ],
+ [
+ -72.3974306450291,
+ 42.033110675812004
+ ],
+ [
+ -72.3669917600491,
+ 42.0326543063241
+ ],
+ [
+ -72.3218210714148,
+ 42.03197706325
+ ],
+ [
+ -72.3212572907063,
+ 42.0319686104991
+ ],
+ [
+ -72.317148,
+ 42.031907
+ ],
+ [
+ -72.2706746240338,
+ 42.031713890667
+ ],
+ [
+ -72.249523,
+ 42.031626
+ ],
+ [
+ -72.24129015451759,
+ 42.0315261233387
+ ],
+ [
+ -72.2050807834552,
+ 42.031086849809796
+ ],
+ [
+ -72.19882718216249,
+ 42.031010984324496
+ ],
+ [
+ -72.1500724858968,
+ 42.030419517340896
+ ],
+ [
+ -72.1432410250888,
+ 42.0303366415602
+ ],
+ [
+ -72.13571500800948,
+ 42.0302453397788
+ ],
+ [
+ -72.135687,
+ 42.030245
+ ],
+ [
+ -72.1021620983386,
+ 42.028899192835496
+ ],
+ [
+ -72.0997439867964,
+ 42.02880212135501
+ ],
+ [
+ -72.063496,
+ 42.027347
+ ],
+ [
+ -72.0346321775835,
+ 42.0271700352492
+ ],
+ [
+ -72.01011364003818,
+ 42.02701971153859
+ ],
+ [
+ -72.01003960018869,
+ 42.027019257598596
+ ],
+ [
+ -71.9931020771696,
+ 42.0269154132603
+ ],
+ [
+ -71.987326,
+ 42.02688
+ ],
+ [
+ -71.9630203859623,
+ 42.0262475998751
+ ],
+ [
+ -71.9523266102909,
+ 42.0259693618902
+ ],
+ [
+ -71.9209614675912,
+ 42.025153282110004
+ ],
+ [
+ -71.9209426671443,
+ 42.0251527929471
+ ],
+ [
+ -71.89078,
+ 42.024368
+ ],
+ [
+ -71.88330606432629,
+ 42.0243017437634
+ ],
+ [
+ -71.88283042926349,
+ 42.0242975272715
+ ],
+ [
+ -71.8773822373224,
+ 42.024249229198
+ ],
+ [
+ -71.86592614936811,
+ 42.0241476712897
+ ],
+ [
+ -71.8603967710167,
+ 42.024098653501
+ ],
+ [
+ -71.8457172790675,
+ 42.023968520203795
+ ],
+ [
+ -71.8416470936308,
+ 42.023932438120596
+ ],
+ [
+ -71.80470355203181,
+ 42.0236049346286
+ ],
+ [
+ -71.80065,
+ 42.023569
+ ],
+ [
+ -71.799242,
+ 42.008065
+ ],
+ [
+ -71.7988654335405,
+ 41.9873338752955
+ ],
+ [
+ -71.79882688153009,
+ 41.9852114703
+ ],
+ [
+ -71.7983794424545,
+ 41.960578593311695
+ ],
+ [
+ -71.797922,
+ 41.935395
+ ],
+ [
+ -71.79780125342009,
+ 41.9323676992798
+ ],
+ [
+ -71.79764920214579,
+ 41.92855554217849
+ ],
+ [
+ -71.79715894256209,
+ 41.9162639874898
+ ],
+ [
+ -71.7966877946775,
+ 41.904451592213896
+ ],
+ [
+ -71.7946917826635,
+ 41.85440853003801
+ ],
+ [
+ -71.7944823560536,
+ 41.8491578858595
+ ],
+ [
+ -71.794161,
+ 41.841101
+ ],
+ [
+ -71.794161,
+ 41.840141
+ ],
+ [
+ -71.792786,
+ 41.80867
+ ],
+ [
+ -71.792767,
+ 41.807001
+ ],
+ [
+ -71.79265663505639,
+ 41.8046235902365
+ ],
+ [
+ -71.79125806357601,
+ 41.774496473912
+ ],
+ [
+ -71.791062,
+ 41.770273
+ ],
+ [
+ -71.79105925492179,
+ 41.770182676218795
+ ],
+ [
+ -71.789678,
+ 41.724734
+ ],
+ [
+ -71.7896715648332,
+ 41.7245691839672
+ ],
+ [
+ -71.7886475406628,
+ 41.698342108883395
+ ],
+ [
+ -71.7869970249528,
+ 41.65606947440539
+ ],
+ [
+ -71.786994,
+ 41.655992
+ ],
+ [
+ -71.78763664588949,
+ 41.639917146298195
+ ],
+ [
+ -71.78785519859501,
+ 41.6344503677445
+ ],
+ [
+ -71.789356,
+ 41.59691
+ ],
+ [
+ -71.7893586727423,
+ 41.5968521603427
+ ],
+ [
+ -71.7905084708522,
+ 41.57196987750189
+ ],
+ [
+ -71.7917190617471,
+ 41.54577200433501
+ ],
+ [
+ -71.7925957022037,
+ 41.5268010079481
+ ],
+ [
+ -71.79356831588959,
+ 41.5057530964788
+ ],
+ [
+ -71.7949846626488,
+ 41.4751025497798
+ ],
+ [
+ -71.795497602244,
+ 41.4640022461898
+ ],
+ [
+ -71.7964992379505,
+ 41.4423262817432
+ ],
+ [
+ -71.7967394589644,
+ 41.437127762839296
+ ],
+ [
+ -71.797235453979,
+ 41.42639414957701
+ ],
+ [
+ -71.7976736925499,
+ 41.4169104184967
+ ],
+ [
+ -71.797683,
+ 41.416709
+ ],
+ [
+ -71.801439,
+ 41.415545
+ ],
+ [
+ -71.803684,
+ 41.417428
+ ],
+ [
+ -71.806812,
+ 41.416673
+ ],
+ [
+ -71.8129,
+ 41.419404
+ ],
+ [
+ -71.816904,
+ 41.419927
+ ],
+ [
+ -71.82033,
+ 41.419382
+ ],
+ [
+ -71.823873,
+ 41.417164
+ ],
+ [
+ -71.824573,
+ 41.415235
+ ],
+ [
+ -71.827902,
+ 41.414334
+ ],
+ [
+ -71.834107,
+ 41.411582
+ ],
+ [
+ -71.836883,
+ 41.412228
+ ],
+ [
+ -71.839649,
+ 41.412119
+ ],
+ [
+ -71.842563,
+ 41.409855
+ ],
+ [
+ -71.8428165698118,
+ 41.408732207378904
+ ],
+ [
+ -71.843472,
+ 41.40583
+ ],
+ [
+ -71.843256,
+ 41.404461
+ ],
+ [
+ -71.841726,
+ 41.403241
+ ],
+ [
+ -71.84115,
+ 41.39923
+ ],
+ [
+ -71.842244,
+ 41.396879
+ ],
+ [
+ -71.8421660144265,
+ 41.3958299905162
+ ],
+ [
+ -71.842131,
+ 41.395359
+ ],
+ [
+ -71.83863230444119,
+ 41.3911510258414
+ ],
+ [
+ -71.83817,
+ 41.390595
+ ],
+ [
+ -71.835204,
+ 41.389558
+ ],
+ [
+ -71.832655,
+ 41.387156
+ ],
+ [
+ -71.83300056281949,
+ 41.3852672388358
+ ],
+ [
+ -71.833531,
+ 41.382368
+ ],
+ [
+ -71.8316433377617,
+ 41.3800224459541
+ ],
+ [
+ -71.830637,
+ 41.378772
+ ],
+ [
+ -71.83131395979309,
+ 41.3777248226273
+ ],
+ [
+ -71.832674,
+ 41.375621
+ ],
+ [
+ -71.8320765800314,
+ 41.3729621714499
+ ],
+ [
+ -71.831613,
+ 41.370899
+ ],
+ [
+ -71.8320107595773,
+ 41.370243998619195
+ ],
+ [
+ -71.8321077620934,
+ 41.3700842619703
+ ],
+ [
+ -71.832499,
+ 41.36944
+ ],
+ [
+ -71.8349469163787,
+ 41.3675609118721
+ ],
+ [
+ -71.8355881682153,
+ 41.367068669276094
+ ],
+ [
+ -71.837633,
+ 41.365499
+ ],
+ [
+ -71.8377133908183,
+ 41.36370561482929
+ ],
+ [
+ -71.83773172144579,
+ 41.3632966890791
+ ],
+ [
+ -71.837873,
+ 41.360145
+ ],
+ [
+ -71.836768,
+ 41.355103
+ ],
+ [
+ -71.835703,
+ 41.353568
+ ],
+ [
+ -71.831303,
+ 41.351295
+ ],
+ [
+ -71.829902,
+ 41.346636
+ ],
+ [
+ -71.829384,
+ 41.342413
+ ],
+ [
+ -71.830617723719,
+ 41.34124704728269
+ ],
+ [
+ -71.836156,
+ 41.336013
+ ],
+ [
+ -71.844666,
+ 41.330585
+ ],
+ [
+ -71.847709,
+ 41.329604
+ ],
+ [
+ -71.851923,
+ 41.324664
+ ],
+ [
+ -71.857458,
+ 41.320789
+ ],
+ [
+ -71.860513,
+ 41.320248
+ ],
+ [
+ -71.85957,
+ 41.322399
+ ],
+ [
+ -71.868727,
+ 41.327815
+ ],
+ [
+ -71.877521,
+ 41.336025
+ ],
+ [
+ -71.8823774862605,
+ 41.3362379310113
+ ],
+ [
+ -71.886302,
+ 41.33641
+ ],
+ [
+ -71.892665,
+ 41.33327
+ ],
+ [
+ -71.89365732907339,
+ 41.3333181458508
+ ],
+ [
+ -71.897962,
+ 41.333527
+ ],
+ [
+ -71.904655,
+ 41.327353
+ ],
+ [
+ -71.9090940294406,
+ 41.3275069485771
+ ],
+ [
+ -71.921206,
+ 41.327927
+ ],
+ [
+ -71.92763,
+ 41.33229
+ ],
+ [
+ -71.932663,
+ 41.333348
+ ],
+ [
+ -71.936284,
+ 41.337959
+ ],
+ [
+ -71.93755544038291,
+ 41.33793728453659
+ ],
+ [
+ -71.945652,
+ 41.337799
+ ],
+ [
+ -71.95413,
+ 41.327913
+ ],
+ [
+ -71.9603568021841,
+ 41.3231338731251
+ ],
+ [
+ -71.96244,
+ 41.321535
+ ],
+ [
+ -71.969266,
+ 41.321033
+ ],
+ [
+ -71.979447,
+ 41.329987
+ ],
+ [
+ -71.9802752216186,
+ 41.3299490109487
+ ],
+ [
+ -71.982194,
+ 41.329861
+ ],
+ [
+ -71.988153,
+ 41.320577
+ ],
+ [
+ -71.989231,
+ 41.315856
+ ],
+ [
+ -71.993724,
+ 41.319536
+ ],
+ [
+ -72.0001008130767,
+ 41.318344817919694
+ ],
+ [
+ -72.000678,
+ 41.318237
+ ],
+ [
+ -72.0036509005825,
+ 41.31054674205419
+ ],
+ [
+ -72.005143,
+ 41.306687
+ ],
+ [
+ -72.00569185040379,
+ 41.3067203454328
+ ],
+ [
+ -72.0102887045407,
+ 41.306999627527794
+ ],
+ [
+ -72.010838,
+ 41.307033
+ ],
+ [
+ -72.0115673936891,
+ 41.3076796279495
+ ],
+ [
+ -72.0202819284619,
+ 41.3154053072847
+ ],
+ [
+ -72.021898,
+ 41.316838
+ ],
+ [
+ -72.027497,
+ 41.316034
+ ],
+ [
+ -72.030262,
+ 41.312121
+ ],
+ [
+ -72.035341,
+ 41.312821
+ ],
+ [
+ -72.036447,
+ 41.31587
+ ],
+ [
+ -72.041527,
+ 41.318488
+ ],
+ [
+ -72.049123,
+ 41.319127
+ ],
+ [
+ -72.0547506764111,
+ 41.313326091497494
+ ],
+ [
+ -72.055068,
+ 41.312999
+ ],
+ [
+ -72.060535,
+ 41.312107
+ ],
+ [
+ -72.065048,
+ 41.315238
+ ],
+ [
+ -72.066956,
+ 41.318893
+ ],
+ [
+ -72.074104,
+ 41.318993
+ ],
+ [
+ -72.0820020402424,
+ 41.3172242653722
+ ],
+ [
+ -72.088478,
+ 41.315774
+ ],
+ [
+ -72.0913367349466,
+ 41.3150024051527
+ ],
+ [
+ -72.094443,
+ 41.314164
+ ],
+ [
+ -72.093097,
+ 41.309429
+ ],
+ [
+ -72.098438,
+ 41.307642
+ ],
+ [
+ -72.1011122448683,
+ 41.304096793875004
+ ],
+ [
+ -72.101358,
+ 41.303771
+ ],
+ [
+ -72.107782,
+ 41.302861
+ ],
+ [
+ -72.11182,
+ 41.299098
+ ],
+ [
+ -72.123044,
+ 41.301751
+ ],
+ [
+ -72.12549875199339,
+ 41.3012342216659
+ ],
+ [
+ -72.134221,
+ 41.299398
+ ],
+ [
+ -72.144041,
+ 41.30291
+ ],
+ [
+ -72.149665,
+ 41.310857
+ ],
+ [
+ -72.1559882169118,
+ 41.3130622872205
+ ],
+ [
+ -72.15632,
+ 41.313178
+ ],
+ [
+ -72.16158,
+ 41.310262
+ ],
+ [
+ -72.161073,
+ 41.306929
+ ],
+ [
+ -72.164401,
+ 41.303715
+ ],
+ [
+ -72.172715,
+ 41.309596
+ ],
+ [
+ -72.173922,
+ 41.317597
+ ],
+ [
+ -72.1774650579298,
+ 41.3222891577989
+ ],
+ [
+ -72.177622,
+ 41.322497
+ ],
+ [
+ -72.184122,
+ 41.323997
+ ],
+ [
+ -72.191022,
+ 41.323197
+ ],
+ [
+ -72.1915159517901,
+ 41.3228407847668
+ ],
+ [
+ -72.201422,
+ 41.315697
+ ],
+ [
+ -72.203022,
+ 41.313197
+ ],
+ [
+ -72.2035779661765,
+ 41.3053578769112
+ ],
+ [
+ -72.2036432942295,
+ 41.304436751363795
+ ],
+ [
+ -72.2039880302184,
+ 41.299575973921094
+ ],
+ [
+ -72.204022,
+ 41.299097
+ ],
+ [
+ -72.2014,
+ 41.28847
+ ],
+ [
+ -72.205109,
+ 41.285187
+ ],
+ [
+ -72.209992,
+ 41.286065
+ ],
+ [
+ -72.212924,
+ 41.291365
+ ],
+ [
+ -72.221836656073,
+ 41.2928355698146
+ ],
+ [
+ -72.225009,
+ 41.293359
+ ],
+ [
+ -72.22519341075159,
+ 41.297287570619396
+ ],
+ [
+ -72.225219986622,
+ 41.2978537262402
+ ],
+ [
+ -72.225276,
+ 41.299047
+ ],
+ [
+ -72.231815,
+ 41.296574
+ ],
+ [
+ -72.235531,
+ 41.300413
+ ],
+ [
+ -72.241173,
+ 41.300153
+ ],
+ [
+ -72.24545,
+ 41.297466
+ ],
+ [
+ -72.248161,
+ 41.299488
+ ],
+ [
+ -72.24881037219129,
+ 41.2993370479212
+ ],
+ [
+ -72.2515208189592,
+ 41.2987069815596
+ ],
+ [
+ -72.251895,
+ 41.29862
+ ],
+ [
+ -72.250515,
+ 41.294386
+ ],
+ [
+ -72.251323,
+ 41.289997
+ ],
+ [
+ -72.261487,
+ 41.282926
+ ],
+ [
+ -72.268805,
+ 41.28443
+ ],
+ [
+ -72.27798,
+ 41.284062
+ ],
+ [
+ -72.2801917116802,
+ 41.2829879661633
+ ],
+ [
+ -72.284687,
+ 41.280805
+ ],
+ [
+ -72.298804,
+ 41.27892
+ ],
+ [
+ -72.31776,
+ 41.277782
+ ],
+ [
+ -72.327595,
+ 41.27846
+ ],
+ [
+ -72.3288945897681,
+ 41.2793793478341
+ ],
+ [
+ -72.32928529009929,
+ 41.2796557346694
+ ],
+ [
+ -72.333894,
+ 41.282916
+ ],
+ [
+ -72.34171,
+ 41.296394
+ ],
+ [
+ -72.346463,
+ 41.311214
+ ],
+ [
+ -72.3490378627189,
+ 41.3115555309125
+ ],
+ [
+ -72.350504,
+ 41.31175
+ ],
+ [
+ -72.356208,
+ 41.299609
+ ],
+ [
+ -72.3562145842289,
+ 41.299376809104004
+ ],
+ [
+ -72.356446,
+ 41.291216
+ ],
+ [
+ -72.3561972493021,
+ 41.2909854607838
+ ],
+ [
+ -72.35581509319589,
+ 41.290631283006796
+ ],
+ [
+ -72.349316,
+ 41.284608
+ ],
+ [
+ -72.3477368421903,
+ 41.280899491349395
+ ],
+ [
+ -72.34566805454621,
+ 41.276041131515
+ ],
+ [
+ -72.345513,
+ 41.275677
+ ],
+ [
+ -72.3439719887267,
+ 41.2720508725429
+ ],
+ [
+ -72.34261,
+ 41.268846
+ ],
+ [
+ -72.348101,
+ 41.270141
+ ],
+ [
+ -72.359063,
+ 41.268114
+ ],
+ [
+ -72.35997567099369,
+ 41.267624802372396
+ ],
+ [
+ -72.3640138656714,
+ 41.2654603035885
+ ],
+ [
+ -72.367617,
+ 41.263529
+ ],
+ [
+ -72.378573,
+ 41.264575
+ ],
+ [
+ -72.386629,
+ 41.261798
+ ],
+ [
+ -72.38897106658659,
+ 41.2649781142955
+ ],
+ [
+ -72.3945701218396,
+ 41.2725806460736
+ ],
+ [
+ -72.39815417063889,
+ 41.277447153664596
+ ],
+ [
+ -72.398688,
+ 41.278172
+ ],
+ [
+ -72.405718,
+ 41.276801
+ ],
+ [
+ -72.4166552242223,
+ 41.2782926471396
+ ],
+ [
+ -72.417699,
+ 41.278435
+ ],
+ [
+ -72.421679,
+ 41.275074
+ ],
+ [
+ -72.426161,
+ 41.274128
+ ],
+ [
+ -72.4311009477311,
+ 41.2760566928499
+ ],
+ [
+ -72.437966,
+ 41.278737
+ ],
+ [
+ -72.451925,
+ 41.278885
+ ],
+ [
+ -72.462256,
+ 41.274484
+ ],
+ [
+ -72.468102,
+ 41.269012
+ ],
+ [
+ -72.471024063245,
+ 41.26973049695739
+ ],
+ [
+ -72.4719752527142,
+ 41.269964381949805
+ ],
+ [
+ -72.4725183102771,
+ 41.270097912669
+ ],
+ [
+ -72.472539,
+ 41.270103
+ ],
+ [
+ -72.485693,
+ 41.270881
+ ],
+ [
+ -72.4862274061012,
+ 41.270687369005294
+ ],
+ [
+ -72.499534,
+ 41.265866
+ ],
+ [
+ -72.507133,
+ 41.260147
+ ],
+ [
+ -72.506974,
+ 41.256896
+ ],
+ [
+ -72.51031,
+ 41.256613
+ ],
+ [
+ -72.514529,
+ 41.258529
+ ],
+ [
+ -72.51802,
+ 41.257762
+ ],
+ [
+ -72.521312,
+ 41.2656
+ ],
+ [
+ -72.5218958750572,
+ 41.2655150556895
+ ],
+ [
+ -72.529416,
+ 41.264421
+ ],
+ [
+ -72.533247,
+ 41.26269
+ ],
+ [
+ -72.536032,
+ 41.25753
+ ],
+ [
+ -72.53633000223189,
+ 41.254811088302496
+ ],
+ [
+ -72.536759,
+ 41.250897
+ ],
+ [
+ -72.543941,
+ 41.248704
+ ],
+ [
+ -72.5469155277365,
+ 41.2508252719589
+ ],
+ [
+ -72.5706046900754,
+ 41.2677190985594
+ ],
+ [
+ -72.57107541105749,
+ 41.2680547912502
+ ],
+ [
+ -72.571136,
+ 41.268098
+ ],
+ [
+ -72.583336,
+ 41.271698
+ ],
+ [
+ -72.5851726267595,
+ 41.27132317821229
+ ],
+ [
+ -72.5909667135432,
+ 41.2701407115218
+ ],
+ [
+ -72.598036,
+ 41.268698
+ ],
+ [
+ -72.601192,
+ 41.269517
+ ],
+ [
+ -72.60408,
+ 41.270771
+ ],
+ [
+ -72.60781325853279,
+ 41.270447373873296
+ ],
+ [
+ -72.607956,
+ 41.270435
+ ],
+ [
+ -72.61035853222701,
+ 41.2708396070327
+ ],
+ [
+ -72.617237,
+ 41.271998
+ ],
+ [
+ -72.61752118034839,
+ 41.2719395290835
+ ],
+ [
+ -72.6192148372338,
+ 41.271591054353
+ ],
+ [
+ -72.63136296231401,
+ 41.2690915429994
+ ],
+ [
+ -72.641538,
+ 41.266998
+ ],
+ [
+ -72.653838,
+ 41.265897
+ ],
+ [
+ -72.65453175216768,
+ 41.2657632719328
+ ],
+ [
+ -72.658424,
+ 41.265013
+ ],
+ [
+ -72.661028,
+ 41.268533
+ ],
+ [
+ -72.6621840014098,
+ 41.268933202255695
+ ],
+ [
+ -72.665667,
+ 41.270139
+ ],
+ [
+ -72.6675584984645,
+ 41.2661897563616
+ ],
+ [
+ -72.667806,
+ 41.265673
+ ],
+ [
+ -72.67041418099919,
+ 41.2664347982888
+ ],
+ [
+ -72.672339,
+ 41.266997
+ ],
+ [
+ -72.67431886746701,
+ 41.2655200350521
+ ],
+ [
+ -72.678701,
+ 41.262251
+ ],
+ [
+ -72.677477,
+ 41.254767
+ ],
+ [
+ -72.684939,
+ 41.257597
+ ],
+ [
+ -72.6851388224456,
+ 41.255498864321595
+ ],
+ [
+ -72.6853985730337,
+ 41.2527714831461
+ ],
+ [
+ -72.685539,
+ 41.251297
+ ],
+ [
+ -72.6902367263958,
+ 41.246886889506
+ ],
+ [
+ -72.690439,
+ 41.246697
+ ],
+ [
+ -72.6934409177529,
+ 41.2454927463509
+ ],
+ [
+ -72.694744,
+ 41.24497
+ ],
+ [
+ -72.69546977896971,
+ 41.2449475640846
+ ],
+ [
+ -72.7018060024966,
+ 41.244751693191404
+ ],
+ [
+ -72.710595,
+ 41.24448
+ ],
+ [
+ -72.713674,
+ 41.249007
+ ],
+ [
+ -72.711208,
+ 41.251018
+ ],
+ [
+ -72.71246,
+ 41.254167
+ ],
+ [
+ -72.722439,
+ 41.259138
+ ],
+ [
+ -72.732813,
+ 41.254727
+ ],
+ [
+ -72.737712,
+ 41.257487
+ ],
+ [
+ -72.735307,
+ 41.261028
+ ],
+ [
+ -72.73681037346579,
+ 41.2613227898949
+ ],
+ [
+ -72.740774,
+ 41.2621
+ ],
+ [
+ -72.75147,
+ 41.258348
+ ],
+ [
+ -72.751707,
+ 41.2621
+ ],
+ [
+ -72.752166,
+ 41.26563
+ ],
+ [
+ -72.754444,
+ 41.266913
+ ],
+ [
+ -72.757477,
+ 41.266913
+ ],
+ [
+ -72.772354,
+ 41.262933
+ ],
+ [
+ -72.777629,
+ 41.265425
+ ],
+ [
+ -72.786142,
+ 41.264796
+ ],
+ [
+ -72.7861532046386,
+ 41.264780984058596
+ ],
+ [
+ -72.790687,
+ 41.258705
+ ],
+ [
+ -72.79991179130229,
+ 41.2577621239595
+ ],
+ [
+ -72.800114922249,
+ 41.257741361722594
+ ],
+ [
+ -72.800275,
+ 41.257725
+ ],
+ [
+ -72.80568100588589,
+ 41.255019525551695
+ ],
+ [
+ -72.806837,
+ 41.254441
+ ],
+ [
+ -72.81124,
+ 41.250201
+ ],
+ [
+ -72.818542,
+ 41.24852
+ ],
+ [
+ -72.819372,
+ 41.254061
+ ],
+ [
+ -72.823563,
+ 41.255564
+ ],
+ [
+ -72.8224196356139,
+ 41.2589198401839
+ ],
+ [
+ -72.821823,
+ 41.260671
+ ],
+ [
+ -72.827052,
+ 41.263529
+ ],
+ [
+ -72.8274549425703,
+ 41.2629466241038
+ ],
+ [
+ -72.830142,
+ 41.259063
+ ],
+ [
+ -72.832281,
+ 41.254596
+ ],
+ [
+ -72.835846,
+ 41.248341
+ ],
+ [
+ -72.8406,
+ 41.251022
+ ],
+ [
+ -72.842025,
+ 41.256708
+ ],
+ [
+ -72.847767,
+ 41.25669
+ ],
+ [
+ -72.8485853153682,
+ 41.25630613204589
+ ],
+ [
+ -72.85021,
+ 41.255544
+ ],
+ [
+ -72.851057,
+ 41.250128
+ ],
+ [
+ -72.854055,
+ 41.24774
+ ],
+ [
+ -72.85977209613749,
+ 41.245823843344205
+ ],
+ [
+ -72.861344,
+ 41.245297
+ ],
+ [
+ -72.8810067309627,
+ 41.2426558690314
+ ],
+ [
+ -72.881445,
+ 41.242597
+ ],
+ [
+ -72.895445,
+ 41.243697
+ ],
+ [
+ -72.9008033370427,
+ 41.2458644172307
+ ],
+ [
+ -72.904345,
+ 41.247297
+ ],
+ [
+ -72.905245,
+ 41.248297
+ ],
+ [
+ -72.903045,
+ 41.252797
+ ],
+ [
+ -72.9028077380474,
+ 41.2528941916432
+ ],
+ [
+ -72.896615271271,
+ 41.2554308647805
+ ],
+ [
+ -72.894745,
+ 41.256197
+ ],
+ [
+ -72.894729565167,
+ 41.2562604543135
+ ],
+ [
+ -72.8946664268966,
+ 41.25652002275859
+ ],
+ [
+ -72.893845,
+ 41.259897
+ ],
+ [
+ -72.89618918723679,
+ 41.2636588715478
+ ],
+ [
+ -72.8963698914716,
+ 41.2639488595268
+ ],
+ [
+ -72.897496,
+ 41.265756
+ ],
+ [
+ -72.905481,
+ 41.270125
+ ],
+ [
+ -72.9051877899981,
+ 41.2714526429645
+ ],
+ [
+ -72.904104,
+ 41.27636
+ ],
+ [
+ -72.9060492973471,
+ 41.2826929201672
+ ],
+ [
+ -72.906194,
+ 41.283164
+ ],
+ [
+ -72.906432,
+ 41.292183
+ ],
+ [
+ -72.90734073911149,
+ 41.295253911480295
+ ],
+ [
+ -72.907621,
+ 41.296201
+ ],
+ [
+ -72.913087,
+ 41.296737
+ ],
+ [
+ -72.921881,
+ 41.289326
+ ],
+ [
+ -72.92639412237381,
+ 41.28314619537319
+ ],
+ [
+ -72.9269914417402,
+ 41.2823282877966
+ ],
+ [
+ -72.927229,
+ 41.282003
+ ],
+ [
+ -72.9283405714876,
+ 41.2815765593094
+ ],
+ [
+ -72.932815,
+ 41.27986
+ ],
+ [
+ -72.932731,
+ 41.281929
+ ],
+ [
+ -72.936489,
+ 41.281698
+ ],
+ [
+ -72.937717,
+ 41.281986
+ ],
+ [
+ -72.9381977329184,
+ 41.2808688519725
+ ],
+ [
+ -72.9382603569286,
+ 41.2807233235787
+ ],
+ [
+ -72.93856,
+ 41.280027
+ ],
+ [
+ -72.9381476760994,
+ 41.2784775221015
+ ],
+ [
+ -72.938023,
+ 41.278009
+ ],
+ [
+ -72.936566,
+ 41.276972
+ ],
+ [
+ -72.9365558635634,
+ 41.27671229521879
+ ],
+ [
+ -72.936413,
+ 41.273052
+ ],
+ [
+ -72.93605871007941,
+ 41.2727597498342
+ ],
+ [
+ -72.934597,
+ 41.271554
+ ],
+ [
+ -72.93038271574409,
+ 41.2681366596667
+ ],
+ [
+ -72.930081,
+ 41.267892
+ ],
+ [
+ -72.9291193141172,
+ 41.2671340837161
+ ],
+ [
+ -72.92887613660321,
+ 41.2669424325739
+ ],
+ [
+ -72.9279380490874,
+ 41.2662031144487
+ ],
+ [
+ -72.926834,
+ 41.265333
+ ],
+ [
+ -72.929582,
+ 41.263207
+ ],
+ [
+ -72.93078911326079,
+ 41.262491143982594
+ ],
+ [
+ -72.93124221992501,
+ 41.2622224375218
+ ],
+ [
+ -72.935322,
+ 41.259803
+ ],
+ [
+ -72.93667179759478,
+ 41.25930058516779
+ ],
+ [
+ -72.939137,
+ 41.258383
+ ],
+ [
+ -72.9401359763307,
+ 41.25815546114249
+ ],
+ [
+ -72.94188263183989,
+ 41.2577576218877
+ ],
+ [
+ -72.9420263843415,
+ 41.2577248790899
+ ],
+ [
+ -72.953612,
+ 41.255086
+ ],
+ [
+ -72.957213,
+ 41.252432
+ ],
+ [
+ -72.9600350564362,
+ 41.251944532659394
+ ],
+ [
+ -72.962047,
+ 41.251597
+ ],
+ [
+ -72.9665310209584,
+ 41.2455100503179
+ ],
+ [
+ -72.970994354728,
+ 41.239451182992696
+ ],
+ [
+ -72.975136,
+ 41.233829
+ ],
+ [
+ -72.978347,
+ 41.23331
+ ],
+ [
+ -72.9786667793222,
+ 41.233450441295396
+ ],
+ [
+ -72.98106338150319,
+ 41.2345029856333
+ ],
+ [
+ -72.981134,
+ 41.234534
+ ],
+ [
+ -72.9816737559306,
+ 41.234674021493596
+ ],
+ [
+ -72.9817193708245,
+ 41.2346858547412
+ ],
+ [
+ -72.9849734321311,
+ 41.2355300113286
+ ],
+ [
+ -72.985143,
+ 41.235574
+ ],
+ [
+ -72.98519968739329,
+ 41.2355107510109
+ ],
+ [
+ -72.9858113738396,
+ 41.2348282615352
+ ],
+ [
+ -72.987035,
+ 41.233463
+ ],
+ [
+ -72.987546,
+ 41.231098
+ ],
+ [
+ -72.9903382779045,
+ 41.2265183164441
+ ],
+ [
+ -72.992042,
+ 41.223724
+ ],
+ [
+ -72.992300372398,
+ 41.2236790713761
+ ],
+ [
+ -72.9928344130653,
+ 41.223586206532595
+ ],
+ [
+ -72.997948,
+ 41.222697
+ ],
+ [
+ -73.00000818235159,
+ 41.22191806752579
+ ],
+ [
+ -73.00208768001781,
+ 41.2211318321419
+ ],
+ [
+ -73.004301,
+ 41.220295
+ ],
+ [
+ -73.0057365725887,
+ 41.21583044441
+ ],
+ [
+ -73.005938946044,
+ 41.2152010735596
+ ],
+ [
+ -73.007548,
+ 41.210197
+ ],
+ [
+ -73.012933220498,
+ 41.2059033782517
+ ],
+ [
+ -73.0134651172266,
+ 41.2054792984275
+ ],
+ [
+ -73.014948,
+ 41.204297
+ ],
+ [
+ -73.01956855548919,
+ 41.204119320496496
+ ],
+ [
+ -73.020149,
+ 41.204097
+ ],
+ [
+ -73.0202391867704,
+ 41.2047884319066
+ ],
+ [
+ -73.020449,
+ 41.206397
+ ],
+ [
+ -73.022549,
+ 41.207197
+ ],
+ [
+ -73.0230117943496,
+ 41.2072188483804
+ ],
+ [
+ -73.029645,
+ 41.207532
+ ],
+ [
+ -73.034251,
+ 41.206167
+ ],
+ [
+ -73.0357241403689,
+ 41.2044291734347
+ ],
+ [
+ -73.0362276566123,
+ 41.2038351880126
+ ],
+ [
+ -73.037941,
+ 41.201814
+ ],
+ [
+ -73.044497,
+ 41.20954
+ ],
+ [
+ -73.0456020141911,
+ 41.2096579903012
+ ],
+ [
+ -73.0489759957363,
+ 41.2100182545423
+ ],
+ [
+ -73.05065,
+ 41.210197
+ ],
+ [
+ -73.0549471812157,
+ 41.2084682489362
+ ],
+ [
+ -73.05935,
+ 41.206697
+ ],
+ [
+ -73.065858,
+ 41.197761
+ ],
+ [
+ -73.0727826240098,
+ 41.195950868786696
+ ],
+ [
+ -73.0734402634471,
+ 41.1957789585616
+ ],
+ [
+ -73.0797045507602,
+ 41.1941414426504
+ ],
+ [
+ -73.08015,
+ 41.194025
+ ],
+ [
+ -73.0808050495963,
+ 41.19349981918089
+ ],
+ [
+ -73.0825817681282,
+ 41.192075349187895
+ ],
+ [
+ -73.0868891076424,
+ 41.188621973890896
+ ],
+ [
+ -73.087842,
+ 41.187858
+ ],
+ [
+ -73.090506659504,
+ 41.184872937676296
+ ],
+ [
+ -73.0926742624665,
+ 41.182444698748796
+ ],
+ [
+ -73.0933567669717,
+ 41.1816801288362
+ ],
+ [
+ -73.097115,
+ 41.17747
+ ],
+ [
+ -73.0989503366726,
+ 41.175941950166404
+ ],
+ [
+ -73.101493,
+ 41.173825
+ ],
+ [
+ -73.103288,
+ 41.174076
+ ],
+ [
+ -73.1042935661222,
+ 41.173187672693004
+ ],
+ [
+ -73.105458,
+ 41.172159
+ ],
+ [
+ -73.1058061668315,
+ 41.1716950509516
+ ],
+ [
+ -73.108005,
+ 41.168765
+ ],
+ [
+ -73.1080084493287,
+ 41.1687516729814
+ ],
+ [
+ -73.110352,
+ 41.159697
+ ],
+ [
+ -73.107039,
+ 41.155529
+ ],
+ [
+ -73.10109,
+ 41.154141
+ ],
+ [
+ -73.10302,
+ 41.151412
+ ],
+ [
+ -73.111052,
+ 41.150797
+ ],
+ [
+ -73.1131343452713,
+ 41.1503632006622
+ ],
+ [
+ -73.130253,
+ 41.146797
+ ],
+ [
+ -73.1378606558334,
+ 41.149023812356496
+ ],
+ [
+ -73.1647956314162,
+ 41.156907862024596
+ ],
+ [
+ -73.172196,
+ 41.159074
+ ],
+ [
+ -73.170701,
+ 41.164945
+ ],
+ [
+ -73.175855,
+ 41.1662216588435
+ ],
+ [
+ -73.177774,
+ 41.166697
+ ],
+ [
+ -73.1815928017535,
+ 41.165377092210896
+ ],
+ [
+ -73.18181385503829,
+ 41.1653006886762
+ ],
+ [
+ -73.184359,
+ 41.164421
+ ],
+ [
+ -73.1846121599728,
+ 41.163709602462895
+ ],
+ [
+ -73.186186,
+ 41.159287
+ ],
+ [
+ -73.202656,
+ 41.158096
+ ],
+ [
+ -73.213994,
+ 41.149624
+ ],
+ [
+ -73.216818,
+ 41.141488
+ ],
+ [
+ -73.2215700691572,
+ 41.1419492533799
+ ],
+ [
+ -73.228295,
+ 41.142602
+ ],
+ [
+ -73.2348411938807,
+ 41.143951311588005
+ ],
+ [
+ -73.235058,
+ 41.143996
+ ],
+ [
+ -73.2351985506033,
+ 41.143700126657194
+ ],
+ [
+ -73.2354744452279,
+ 41.1431193403574
+ ],
+ [
+ -73.2378387321871,
+ 41.138142275376005
+ ],
+ [
+ -73.242565,
+ 41.128193
+ ],
+ [
+ -73.24292234354029,
+ 41.12799987597379
+ ],
+ [
+ -73.262358,
+ 41.117496
+ ],
+ [
+ -73.2684906684439,
+ 41.118659586425004
+ ],
+ [
+ -73.274127,
+ 41.119729
+ ],
+ [
+ -73.277713,
+ 41.124041
+ ],
+ [
+ -73.286319367717,
+ 41.127708648413595
+ ],
+ [
+ -73.286759,
+ 41.127896
+ ],
+ [
+ -73.296359,
+ 41.125696
+ ],
+ [
+ -73.29745864725889,
+ 41.1238300360574
+ ],
+ [
+ -73.2975262590239,
+ 41.123715307343694
+ ],
+ [
+ -73.2976901854783,
+ 41.12343714464149
+ ],
+ [
+ -73.299559,
+ 41.120266
+ ],
+ [
+ -73.30664,
+ 41.116522
+ ],
+ [
+ -73.308829,
+ 41.11382
+ ],
+ [
+ -73.31186,
+ 41.116296
+ ],
+ [
+ -73.3176646238028,
+ 41.11619628040359
+ ],
+ [
+ -73.3192115774442,
+ 41.1161697047636
+ ],
+ [
+ -73.320475,
+ 41.116148
+ ],
+ [
+ -73.3228355447183,
+ 41.1147221707308
+ ],
+ [
+ -73.32861342197128,
+ 41.1112321853739
+ ],
+ [
+ -73.33066,
+ 41.109996
+ ],
+ [
+ -73.330957221598,
+ 41.1100872499775
+ ],
+ [
+ -73.3310755801918,
+ 41.1101235872393
+ ],
+ [
+ -73.336409,
+ 41.111761
+ ],
+ [
+ -73.34722026487249,
+ 41.1075859999947
+ ],
+ [
+ -73.350351,
+ 41.106377
+ ],
+ [
+ -73.352671,
+ 41.101611
+ ],
+ [
+ -73.357078,
+ 41.103791
+ ],
+ [
+ -73.368249,
+ 41.107194
+ ],
+ [
+ -73.3680613466089,
+ 41.1028164721535
+ ],
+ [
+ -73.368011,
+ 41.101642
+ ],
+ [
+ -73.365396,
+ 41.097343
+ ],
+ [
+ -73.369199,
+ 41.095552
+ ],
+ [
+ -73.382787,
+ 41.0954
+ ],
+ [
+ -73.379693,
+ 41.090455
+ ],
+ [
+ -73.381028,
+ 41.088802
+ ],
+ [
+ -73.383662,
+ 41.089798000895
+ ],
+ [
+ -73.387732,
+ 41.091337
+ ],
+ [
+ -73.392162,
+ 41.087696
+ ],
+ [
+ -73.3923500607244,
+ 41.0863926574146
+ ],
+ [
+ -73.392967,
+ 41.082117
+ ],
+ [
+ -73.398196,
+ 41.081938
+ ],
+ [
+ -73.402474,
+ 41.086058
+ ],
+ [
+ -73.40259532129939,
+ 41.085912130154
+ ],
+ [
+ -73.405632,
+ 41.082261
+ ],
+ [
+ -73.40785,
+ 41.081115
+ ],
+ [
+ -73.407228,
+ 41.075488
+ ],
+ [
+ -73.408416,
+ 41.071008
+ ],
+ [
+ -73.412932,
+ 41.071008
+ ],
+ [
+ -73.42199635917109,
+ 41.0642269064179
+ ],
+ [
+ -73.43325,
+ 41.055808
+ ],
+ [
+ -73.435063,
+ 41.056696
+ ],
+ [
+ -73.438152,
+ 41.055515
+ ],
+ [
+ -73.440841,
+ 41.055863
+ ],
+ [
+ -73.443694,
+ 41.057633
+ ],
+ [
+ -73.4466868081709,
+ 41.0573920497769
+ ],
+ [
+ -73.450364,
+ 41.057096
+ ],
+ [
+ -73.45063655445911,
+ 41.056842633680795
+ ],
+ [
+ -73.458915,
+ 41.049147
+ ],
+ [
+ -73.468239,
+ 41.051347
+ ],
+ [
+ -73.476155,
+ 41.044304
+ ],
+ [
+ -73.477364,
+ 41.035997
+ ],
+ [
+ -73.489759,
+ 41.039965
+ ],
+ [
+ -73.4916102435144,
+ 41.044223690237196
+ ],
+ [
+ -73.493327,
+ 41.048173
+ ],
+ [
+ -73.4956630331328,
+ 41.046784198678196
+ ],
+ [
+ -73.505865,
+ 41.040719
+ ],
+ [
+ -73.505865,
+ 41.034265
+ ],
+ [
+ -73.516872115002,
+ 41.0387254842729
+ ],
+ [
+ -73.516903,
+ 41.038738
+ ],
+ [
+ -73.52118110266501,
+ 41.0377344944366
+ ],
+ [
+ -73.5228860701339,
+ 41.0373345637957
+ ],
+ [
+ -73.522978,
+ 41.037313
+ ],
+ [
+ -73.52260290071469,
+ 41.036216313084
+ ],
+ [
+ -73.521077,
+ 41.031755
+ ],
+ [
+ -73.5205949647912,
+ 41.03150252134039
+ ],
+ [
+ -73.517156641692,
+ 41.029701608893696
+ ],
+ [
+ -73.516766,
+ 41.029497
+ ],
+ [
+ -73.51880927306568,
+ 41.0259645618187
+ ],
+ [
+ -73.52066508323459,
+ 41.0227562120351
+ ],
+ [
+ -73.522370507094,
+ 41.0198078521426
+ ],
+ [
+ -73.522666,
+ 41.019297
+ ],
+ [
+ -73.528866,
+ 41.016397
+ ],
+ [
+ -73.5292185791445,
+ 41.0172423938497
+ ],
+ [
+ -73.531169,
+ 41.021919
+ ],
+ [
+ -73.530189,
+ 41.028776
+ ],
+ [
+ -73.532786,
+ 41.03167
+ ],
+ [
+ -73.53441008767169,
+ 41.03182909949759
+ ],
+ [
+ -73.535338,
+ 41.03192
+ ],
+ [
+ -73.53666784610779,
+ 41.031069245395194
+ ],
+ [
+ -73.53880634442169,
+ 41.0297011643238
+ ],
+ [
+ -73.53990309676739,
+ 41.0289995289219
+ ],
+ [
+ -73.544845,
+ 41.025838
+ ],
+ [
+ -73.547436,
+ 41.022881
+ ],
+ [
+ -73.551494,
+ 41.024336
+ ],
+ [
+ -73.552870490795,
+ 41.0233452383279
+ ],
+ [
+ -73.55644,
+ 41.020776
+ ],
+ [
+ -73.557168,
+ 41.017158
+ ],
+ [
+ -73.561968,
+ 41.016797
+ ],
+ [
+ -73.56394582303349,
+ 41.01474977966701
+ ],
+ [
+ -73.567668,
+ 41.010897
+ ],
+ [
+ -73.570068,
+ 41.001597
+ ],
+ [
+ -73.583968,
+ 41.000897
+ ],
+ [
+ -73.585115,
+ 41.005464
+ ],
+ [
+ -73.58760717194349,
+ 41.0076083911386
+ ],
+ [
+ -73.5876450291519,
+ 41.0076409654007
+ ],
+ [
+ -73.58765810889219,
+ 41.0076522198727
+ ],
+ [
+ -73.593191,
+ 41.012413
+ ],
+ [
+ -73.595699,
+ 41.015995
+ ],
+ [
+ -73.59674205686649,
+ 41.0158760715483
+ ],
+ [
+ -73.603952,
+ 41.015054
+ ],
+ [
+ -73.614722,
+ 41.008801
+ ],
+ [
+ -73.619487022323,
+ 41.0077142895964
+ ],
+ [
+ -73.624943,
+ 41.00647
+ ],
+ [
+ -73.627086,
+ 41.001809
+ ],
+ [
+ -73.639885,
+ 41.003118
+ ],
+ [
+ -73.6410127012996,
+ 41.0022674354848
+ ],
+ [
+ -73.6422681924053,
+ 41.0013204859831
+ ],
+ [
+ -73.643653,
+ 41.000276
+ ],
+ [
+ -73.6487877738617,
+ 40.996830745589
+ ],
+ [
+ -73.651175,
+ 40.995229
+ ],
+ [
+ -73.6518688939799,
+ 40.9940961992129
+ ],
+ [
+ -73.653722054959,
+ 40.9910708635323
+ ],
+ [
+ -73.656829806646,
+ 40.9859973744123
+ ],
+ [
+ -73.657336,
+ 40.985171
+ ],
+ [
+ -73.6576158881351,
+ 40.98549919431
+ ],
+ [
+ -73.659671,
+ 40.987909
+ ],
+ [
+ -73.657228,
+ 40.990914
+ ],
+ [
+ -73.659639,
+ 40.994339
+ ],
+ [
+ -73.65950070028201,
+ 40.995525863034
+ ],
+ [
+ -73.659309,
+ 40.997171
+ ],
+ [
+ -73.660268,
+ 41.000484
+ ],
+ [
+ -73.6585172688616,
+ 41.003999208203
+ ],
+ [
+ -73.6585107167126,
+ 41.00401236394519
+ ],
+ [
+ -73.6579245992895,
+ 41.0051892007126
+ ],
+ [
+ -73.656065,
+ 41.008923
+ ],
+ [
+ -73.6556887421582,
+ 41.01026045050809
+ ],
+ [
+ -73.655241,
+ 41.011852
+ ],
+ [
+ -73.655255,
+ 41.012246
+ ],
+ [
+ -73.655331976322,
+ 41.0123253874133
+ ],
+ [
+ -73.65566792918719,
+ 41.012671863164094
+ ],
+ [
+ -73.656117,
+ 41.013135
+ ],
+ [
+ -73.658679,
+ 41.016706
+ ],
+ [
+ -73.6604129558331,
+ 41.0183522375566
+ ],
+ [
+ -73.662672,
+ 41.020497
+ ],
+ [
+ -73.66655447294119,
+ 41.025275428235304
+ ],
+ [
+ -73.66672215108149,
+ 41.0254818013311
+ ],
+ [
+ -73.670472,
+ 41.030097
+ ],
+ [
+ -73.6722427528981,
+ 41.0322775924543
+ ],
+ [
+ -73.6757716832468,
+ 41.0366232913364
+ ],
+ [
+ -73.67578635991521,
+ 41.0366413649098
+ ],
+ [
+ -73.679973,
+ 41.041797
+ ],
+ [
+ -73.687173,
+ 41.050697
+ ],
+ [
+ -73.6895100450317,
+ 41.05352745777849
+ ],
+ [
+ -73.694273,
+ 41.059296
+ ],
+ [
+ -73.70616305989901,
+ 41.074183562832594
+ ],
+ [
+ -73.716875,
+ 41.087596
+ ],
+ [
+ -73.722575,
+ 41.093596
+ ],
+ [
+ -73.727775,
+ 41.100696
+ ]
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/kansas_state_geojson.json b/tests/data/kansas_state_geojson.json
new file mode 100644
index 00000000..2c4ffd6a
--- /dev/null
+++ b/tests/data/kansas_state_geojson.json
@@ -0,0 +1,5984 @@
+{
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ -102.051744,
+ 40.003078
+ ],
+ [
+ -101.916696,
+ 40.003142
+ ],
+ [
+ -101.904176,
+ 40.003162
+ ],
+ [
+ -101.861740696376,
+ 40.0029079969791
+ ],
+ [
+ -101.841025,
+ 40.002784
+ ],
+ [
+ -101.832161,
+ 40.002933
+ ],
+ [
+ -101.81280613107602,
+ 40.0028262374232
+ ],
+ [
+ -101.807687,
+ 40.002798
+ ],
+ [
+ -101.804862,
+ 40.002752
+ ],
+ [
+ -101.783414597766,
+ 40.0027360764881
+ ],
+ [
+ -101.748481056436,
+ 40.0027101402627
+ ],
+ [
+ -101.627071,
+ 40.00262
+ ],
+ [
+ -101.625809,
+ 40.002711
+ ],
+ [
+ -101.597806045257,
+ 40.0026768075395
+ ],
+ [
+ -101.579637359188,
+ 40.0026546230205
+ ],
+ [
+ -101.54227707814,
+ 40.0026090049795
+ ],
+ [
+ -101.542273,
+ 40.002609
+ ],
+ [
+ -101.53131110386501,
+ 40.002592784696006
+ ],
+ [
+ -101.417209,
+ 40.002424
+ ],
+ [
+ -101.411042549953,
+ 40.0023645110938
+ ],
+ [
+ -101.409953,
+ 40.002354
+ ],
+ [
+ -101.374326,
+ 40.002521
+ ],
+ [
+ -101.342859,
+ 40.00258
+ ],
+ [
+ -101.32551390689501,
+ 40.0026868921426
+ ],
+ [
+ -101.324036,
+ 40.002696
+ ],
+ [
+ -101.293991,
+ 40.002559
+ ],
+ [
+ -101.286555,
+ 40.002559
+ ],
+ [
+ -101.248673,
+ 40.002543
+ ],
+ [
+ -101.215033,
+ 40.002555
+ ],
+ [
+ -101.210263053319,
+ 40.0025416188925
+ ],
+ [
+ -101.192219,
+ 40.002491
+ ],
+ [
+ -101.18689199851501,
+ 40.002481866182
+ ],
+ [
+ -101.178805,
+ 40.002468
+ ],
+ [
+ -101.168704,
+ 40.002547
+ ],
+ [
+ -101.130907,
+ 40.002427
+ ],
+ [
+ -101.098029118812,
+ 40.0023711089992
+ ],
+ [
+ -101.060317,
+ 40.002307
+ ],
+ [
+ -101.027686,
+ 40.002256
+ ],
+ [
+ -100.984844104147,
+ 40.0022033132824
+ ],
+ [
+ -100.96226782612202,
+ 40.0021755491053
+ ],
+ [
+ -100.937427,
+ 40.002145
+ ],
+ [
+ -100.871047256419,
+ 40.0022033527144
+ ],
+ [
+ -100.75883,
+ 40.002302
+ ],
+ [
+ -100.752183,
+ 40.002128
+ ],
+ [
+ -100.749622287449,
+ 40.0021472524584
+ ],
+ [
+ -100.73882584525201,
+ 40.002228424417495
+ ],
+ [
+ -100.733296,
+ 40.00227
+ ],
+ [
+ -100.729904,
+ 40.002111
+ ],
+ [
+ -100.721128,
+ 40.002069
+ ],
+ [
+ -100.702721168408,
+ 40.0021495753645
+ ],
+ [
+ -100.6916442797,
+ 40.0021980641193
+ ],
+ [
+ -100.683435,
+ 40.002234
+ ],
+ [
+ -100.66509584290401,
+ 40.0021770976379
+ ],
+ [
+ -100.66023,
+ 40.002162
+ ],
+ [
+ -100.645917008652,
+ 40.0018919070283
+ ],
+ [
+ -100.645445,
+ 40.001883
+ ],
+ [
+ -100.627121902041,
+ 40.0018924703652
+ ],
+ [
+ -100.626769823934,
+ 40.0018926523382
+ ],
+ [
+ -100.608894334389,
+ 40.001901891355296
+ ],
+ [
+ -100.600945,
+ 40.001906
+ ],
+ [
+ -100.59934297548,
+ 40.0019243813414
+ ],
+ [
+ -100.594757,
+ 40.001977
+ ],
+ [
+ -100.567238,
+ 40.001889
+ ],
+ [
+ -100.551886,
+ 40.001889
+ ],
+ [
+ -100.533682043035,
+ 40.0018671486516
+ ],
+ [
+ -100.532916063344,
+ 40.0018662291983
+ ],
+ [
+ -100.514415939423,
+ 40.0018440223422
+ ],
+ [
+ -100.511065,
+ 40.00184
+ ],
+ [
+ -100.487159,
+ 40.001767
+ ],
+ [
+ -100.477018,
+ 40.001752
+ ],
+ [
+ -100.475854,
+ 40.001768
+ ],
+ [
+ -100.468773,
+ 40.001724
+ ],
+ [
+ -100.46346317190701,
+ 40.00174137236969
+ ],
+ [
+ -100.45754938827601,
+ 40.001760720724
+ ],
+ [
+ -100.447072,
+ 40.001795
+ ],
+ [
+ -100.439081,
+ 40.001774
+ ],
+ [
+ -100.420010724232,
+ 40.0017876213476
+ ],
+ [
+ -100.40245092792,
+ 40.001800163803196
+ ],
+ [
+ -100.39008,
+ 40.001809
+ ],
+ [
+ -100.307189232831,
+ 40.001711683347
+ ],
+ [
+ -100.29011492209601,
+ 40.001691637510504
+ ],
+ [
+ -100.231652,
+ 40.001623
+ ],
+ [
+ -100.229479,
+ 40.001693
+ ],
+ [
+ -100.215406,
+ 40.001629
+ ],
+ [
+ -100.196959,
+ 40.001494
+ ],
+ [
+ -100.193596885795,
+ 40.001572838534294
+ ],
+ [
+ -100.19359,
+ 40.001573
+ ],
+ [
+ -100.190323,
+ 40.001586
+ ],
+ [
+ -100.188181,
+ 40.001541
+ ],
+ [
+ -100.177823,
+ 40.001593
+ ],
+ [
+ -100.177794883236,
+ 40.001592986460395
+ ],
+ [
+ -100.14589003485301,
+ 40.001577622723396
+ ],
+ [
+ -100.13725003252301,
+ 40.0015734621419
+ ],
+ [
+ -100.131523507268,
+ 40.0015707045413
+ ],
+ [
+ -100.12721004496301,
+ 40.0015686273993
+ ],
+ [
+ -100.099189029792,
+ 40.001555133917
+ ],
+ [
+ -100.080715024444,
+ 40.001546237784495
+ ],
+ [
+ -100.042975064497,
+ 40.0015280641573
+ ],
+ [
+ -100.032247054946,
+ 40.0015228980987
+ ],
+ [
+ -99.990926,
+ 40.001503
+ ],
+ [
+ -99.986611,
+ 40.00155
+ ],
+ [
+ -99.9576989985665,
+ 40.0017477904583
+ ],
+ [
+ -99.948167,
+ 40.001813
+ ],
+ [
+ -99.944417,
+ 40.001584
+ ],
+ [
+ -99.930433,
+ 40.001516
+ ],
+ [
+ -99.906658,
+ 40.001512
+ ],
+ [
+ -99.8546011747661,
+ 40.0014494806778
+ ],
+ [
+ -99.85008090105369,
+ 40.0014440519094
+ ],
+ [
+ -99.83221548107039,
+ 40.0014225958575
+ ],
+ [
+ -99.813401,
+ 40.0014
+ ],
+ [
+ -99.77564,
+ 40.001647
+ ],
+ [
+ -99.772121,
+ 40.001804
+ ],
+ [
+ -99.764214,
+ 40.001551
+ ],
+ [
+ -99.756835,
+ 40.001342
+ ],
+ [
+ -99.746628,
+ 40.00182
+ ],
+ [
+ -99.7411603496972,
+ 40.0018226091453
+ ],
+ [
+ -99.731959,
+ 40.001827
+ ],
+ [
+ -99.719639,
+ 40.001808
+ ],
+ [
+ -99.628346,
+ 40.001866
+ ],
+ [
+ -99.6282545420969,
+ 40.0018659613449
+ ],
+ [
+ -99.62598,
+ 40.001865
+ ],
+ [
+ -99.6253240088811,
+ 40.001865850441
+ ],
+ [
+ -99.6093522986999,
+ 40.0018865565104
+ ],
+ [
+ -99.58067335271501,
+ 40.0019237365141
+ ],
+ [
+ -99.51785109897239,
+ 40.002005180637894
+ ],
+ [
+ -99.51533905631301,
+ 40.0020084373042
+ ],
+ [
+ -99.501792,
+ 40.002026
+ ],
+ [
+ -99.498999,
+ 40.001957
+ ],
+ [
+ -99.49766,
+ 40.001912
+ ],
+ [
+ -99.493465,
+ 40.001937
+ ],
+ [
+ -99.480728,
+ 40.001942
+ ],
+ [
+ -99.423565,
+ 40.00227
+ ],
+ [
+ -99.4140649965405,
+ 40.0019202745979
+ ],
+ [
+ -99.412645,
+ 40.001868
+ ],
+ [
+ -99.40465341610759,
+ 40.001955202892496
+ ],
+ [
+ -99.403389,
+ 40.001969
+ ],
+ [
+ -99.3850545296671,
+ 40.001965745918696
+ ],
+ [
+ -99.36677398198509,
+ 40.001962501407796
+ ],
+ [
+ -99.29184604292439,
+ 40.0019492028722
+ ],
+ [
+ -99.2909099996385,
+ 40.0019490367392
+ ],
+ [
+ -99.290703,
+ 40.001949
+ ],
+ [
+ -99.286656,
+ 40.002017
+ ],
+ [
+ -99.282967,
+ 40.001879
+ ],
+ [
+ -99.254012,
+ 40.002074
+ ],
+ [
+ -99.25037,
+ 40.001957
+ ],
+ [
+ -99.2352752392307,
+ 40.00198319847279
+ ],
+ [
+ -99.2165969472664,
+ 40.0020156165238
+ ],
+ [
+ -99.216376,
+ 40.002016
+ ],
+ [
+ -99.19780448861329,
+ 40.0020328076924
+ ],
+ [
+ -99.197592,
+ 40.002033
+ ],
+ [
+ -99.188905,
+ 40.002023
+ ],
+ [
+ -99.186962,
+ 40.001977
+ ],
+ [
+ -99.179158,
+ 40.001977
+ ],
+ [
+ -99.179134,
+ 40.001977
+ ],
+ [
+ -99.178965,
+ 40.001977
+ ],
+ [
+ -99.169816,
+ 40.001925
+ ],
+ [
+ -99.123033,
+ 40.002165
+ ],
+ [
+ -99.11351,
+ 40.002193
+ ],
+ [
+ -99.085597,
+ 40.002133
+ ],
+ [
+ -99.067021970224,
+ 40.0021702872539
+ ],
+ [
+ -99.06610565498379,
+ 40.002172126652205
+ ],
+ [
+ -99.020338,
+ 40.002264
+ ],
+ [
+ -99.018701,
+ 40.002333
+ ],
+ [
+ -98.992135,
+ 40.002192
+ ],
+ [
+ -98.972287,
+ 40.002245
+ ],
+ [
+ -98.971721,
+ 40.002268
+ ],
+ [
+ -98.961009,
+ 40.002317
+ ],
+ [
+ -98.960919,
+ 40.002271
+ ],
+ [
+ -98.9538856661394,
+ 40.0022532329378
+ ],
+ [
+ -98.952644126062,
+ 40.002250096655594
+ ],
+ [
+ -98.934792,
+ 40.002205
+ ],
+ [
+ -98.8795749269619,
+ 40.0022919508206
+ ],
+ [
+ -98.84250502098318,
+ 40.0023503251344
+ ],
+ [
+ -98.834456,
+ 40.002363
+ ],
+ [
+ -98.82059,
+ 40.002319
+ ],
+ [
+ -98.777203,
+ 40.002359
+ ],
+ [
+ -98.774941,
+ 40.002336
+ ],
+ [
+ -98.72927257073219,
+ 40.00222897782059
+ ],
+ [
+ -98.7263734167054,
+ 40.0022221837665
+ ],
+ [
+ -98.726295,
+ 40.002222
+ ],
+ [
+ -98.710404,
+ 40.00218
+ ],
+ [
+ -98.693096,
+ 40.002373
+ ],
+ [
+ -98.691443,
+ 40.002505
+ ],
+ [
+ -98.690287,
+ 40.002548
+ ],
+ [
+ -98.672819,
+ 40.002364
+ ],
+ [
+ -98.669724,
+ 40.00241
+ ],
+ [
+ -98.653833,
+ 40.002269
+ ],
+ [
+ -98.652494,
+ 40.002245
+ ],
+ [
+ -98.64071,
+ 40.002493
+ ],
+ [
+ -98.6164139993994,
+ 40.002409174065804
+ ],
+ [
+ -98.613755,
+ 40.0024
+ ],
+ [
+ -98.593342,
+ 40.002476
+ ],
+ [
+ -98.575219,
+ 40.00248
+ ],
+ [
+ -98.560578,
+ 40.002274
+ ],
+ [
+ -98.543186,
+ 40.002285
+ ],
+ [
+ -98.523053,
+ 40.002336
+ ],
+ [
+ -98.5044549849831,
+ 40.0023285653691
+ ],
+ [
+ -98.4996470645029,
+ 40.0023266433837
+ ],
+ [
+ -98.490533,
+ 40.002323
+ ],
+ [
+ -98.4151559145965,
+ 40.0023901896908
+ ],
+ [
+ -98.3918540062045,
+ 40.002410960565896
+ ],
+ [
+ -98.2740168698569,
+ 40.002515998333195
+ ],
+ [
+ -98.274015,
+ 40.002516
+ ],
+ [
+ -98.268218,
+ 40.00249
+ ],
+ [
+ -98.250008,
+ 40.002307
+ ],
+ [
+ -98.21305462840401,
+ 40.0025077020801
+ ],
+ [
+ -98.193483,
+ 40.002614
+ ],
+ [
+ -98.179315,
+ 40.002483
+ ],
+ [
+ -98.172269,
+ 40.002438
+ ],
+ [
+ -98.15684409451629,
+ 40.0024451416323
+ ],
+ [
+ -98.142031,
+ 40.002452
+ ],
+ [
+ -98.099659,
+ 40.002227
+ ],
+ [
+ -98.0872378021247,
+ 40.0022659066092
+ ],
+ [
+ -98.076034,
+ 40.002301
+ ],
+ [
+ -98.068701,
+ 40.002355
+ ],
+ [
+ -98.050057,
+ 40.002278
+ ],
+ [
+ -98.0476868968823,
+ 40.0021937459479
+ ],
+ [
+ -98.047469,
+ 40.002186
+ ],
+ [
+ -98.04276800477001,
+ 40.0021912617244
+ ],
+ [
+ -98.014412,
+ 40.002223
+ ],
+ [
+ -98.010157,
+ 40.002153
+ ],
+ [
+ -98.01014211607801,
+ 40.002152984712694
+ ],
+ [
+ -97.9884393526722,
+ 40.002130693812504
+ ],
+ [
+ -97.972186,
+ 40.002114
+ ],
+ [
+ -97.93182554601101,
+ 40.0020500230574
+ ],
+ [
+ -97.931811,
+ 40.00205
+ ],
+ [
+ -97.876261,
+ 40.002102
+ ],
+ [
+ -97.87038929787329,
+ 40.002090450748
+ ],
+ [
+ -97.85745,
+ 40.002065
+ ],
+ [
+ -97.84026402958959,
+ 40.0019253206222
+ ],
+ [
+ -97.838379,
+ 40.00191
+ ],
+ [
+ -97.8328334682074,
+ 40.0019410637023
+ ],
+ [
+ -97.821598,
+ 40.002004
+ ],
+ [
+ -97.8214959564515,
+ 40.0020018388567
+ ],
+ [
+ -97.819426,
+ 40.001958
+ ],
+ [
+ -97.8192617256377,
+ 40.0019588122198
+ ],
+ [
+ -97.777155,
+ 40.002167
+ ],
+ [
+ -97.770776,
+ 40.001977
+ ],
+ [
+ -97.77045,
+ 40.00198073282439
+ ],
+ [
+ -97.769204,
+ 40.001995
+ ],
+ [
+ -97.767746,
+ 40.001994
+ ],
+ [
+ -97.76494005158939,
+ 40.0019929662681
+ ],
+ [
+ -97.7070175863979,
+ 40.0019716272096
+ ],
+ [
+ -97.67066206585879,
+ 40.0019582335707
+ ],
+ [
+ -97.62337004943619,
+ 40.001940810846996
+ ],
+ [
+ -97.6140300448094,
+ 40.0019373699212
+ ],
+ [
+ -97.6117671679522,
+ 40.0019365362609
+ ],
+ [
+ -97.59372489205239,
+ 40.0019298893548
+ ],
+ [
+ -97.515308,
+ 40.001901
+ ],
+ [
+ -97.511381,
+ 40.001899
+ ],
+ [
+ -97.510264,
+ 40.001835
+ ],
+ [
+ -97.5005698075154,
+ 40.0018787465422
+ ],
+ [
+ -97.4965638502884,
+ 40.00189682404349
+ ],
+ [
+ -97.4813648502377,
+ 40.001965411880796
+ ],
+ [
+ -97.463285,
+ 40.002047
+ ],
+ [
+ -97.444662,
+ 40.001958
+ ],
+ [
+ -97.4351360863004,
+ 40.002002608576596
+ ],
+ [
+ -97.425443,
+ 40.002048
+ ],
+ [
+ -97.417826,
+ 40.002024
+ ],
+ [
+ -97.415833,
+ 40.002001
+ ],
+ [
+ -97.4068490471481,
+ 40.0020123428893
+ ],
+ [
+ -97.3691991185285,
+ 40.002059878643394
+ ],
+ [
+ -97.3691985101944,
+ 40.0020598794115
+ ],
+ [
+ -97.369103,
+ 40.00206
+ ],
+ [
+ -97.350896,
+ 40.00193
+ ],
+ [
+ -97.350272,
+ 40.001976
+ ],
+ [
+ -97.25653979528639,
+ 40.001563090656
+ ],
+ [
+ -97.25592608197451,
+ 40.0015603871246
+ ],
+ [
+ -97.245169,
+ 40.001513
+ ],
+ [
+ -97.24508,
+ 40.001467
+ ],
+ [
+ -97.20231,
+ 40.001442
+ ],
+ [
+ -97.20019,
+ 40.001549
+ ],
+ [
+ -97.181775,
+ 40.00155
+ ],
+ [
+ -97.14415621153519,
+ 40.0014973889855
+ ],
+ [
+ -97.142448,
+ 40.001495
+ ],
+ [
+ -97.1418920063917,
+ 40.00153370841569
+ ],
+ [
+ -97.137866,
+ 40.001814
+ ],
+ [
+ -97.049663,
+ 40.001323
+ ],
+ [
+ -97.0309466272116,
+ 40.0013418553066
+ ],
+ [
+ -97.030803,
+ 40.001342
+ ],
+ [
+ -97.0294672936045,
+ 40.0013494692889
+ ],
+ [
+ -97.0130921288369,
+ 40.0014410394404
+ ],
+ [
+ -97.010203219208,
+ 40.001457194263594
+ ],
+ [
+ -97.009165,
+ 40.001463
+ ],
+ [
+ -96.98317196535349,
+ 40.0014750089876
+ ],
+ [
+ -96.9306739945776,
+ 40.0014992634652
+ ],
+ [
+ -96.919197989173,
+ 40.0015045654704
+ ],
+ [
+ -96.9184537619345,
+ 40.0015049093093
+ ],
+ [
+ -96.9164069976229,
+ 40.0015058549306
+ ],
+ [
+ -96.916093,
+ 40.001506
+ ],
+ [
+ -96.880459,
+ 40.001448
+ ],
+ [
+ -96.878253,
+ 40.001466
+ ],
+ [
+ -96.875057,
+ 40.001448
+ ],
+ [
+ -96.873812,
+ 40.00145
+ ],
+ [
+ -96.805768,
+ 40.0013709706497
+ ],
+ [
+ -96.80318811269,
+ 40.001367974252894
+ ],
+ [
+ -96.6956571369541,
+ 40.0012430829597
+ ],
+ [
+ -96.69340766893919,
+ 40.0012404703268
+ ],
+ [
+ -96.6899211168171,
+ 40.0012364208889
+ ],
+ [
+ -96.6710661492202,
+ 40.0012145218847
+ ],
+ [
+ -96.66366013598169,
+ 40.001205920209095
+ ],
+ [
+ -96.6615501539268,
+ 40.0012034695814
+ ],
+ [
+ -96.63358212429048,
+ 40.00117098625869
+ ],
+ [
+ -96.622401,
+ 40.001158
+ ],
+ [
+ -96.6144632036756,
+ 40.000975559775796
+ ],
+ [
+ -96.610349,
+ 40.000881
+ ],
+ [
+ -96.604884,
+ 40.000891
+ ],
+ [
+ -96.60132402261219,
+ 40.000902110115796
+ ],
+ [
+ -96.59542600065319,
+ 40.0009205168921
+ ],
+ [
+ -96.5857539990689,
+ 40.000950701650694
+ ],
+ [
+ -96.58178800024619,
+ 40.000963078894
+ ],
+ [
+ -96.580852,
+ 40.000966
+ ],
+ [
+ -96.57675597722701,
+ 40.0010172105268
+ ],
+ [
+ -96.570854,
+ 40.001091
+ ],
+ [
+ -96.563821,
+ 40.0010244108999
+ ],
+ [
+ -96.55794536548989,
+ 40.0009687798441
+ ],
+ [
+ -96.55794464967089,
+ 40.0009687730667
+ ],
+ [
+ -96.557863,
+ 40.000968
+ ],
+ [
+ -96.5540311940262,
+ 40.0009442617124
+ ],
+ [
+ -96.538977,
+ 40.000851
+ ],
+ [
+ -96.5296959967715,
+ 40.0009917871718
+ ],
+ [
+ -96.527111,
+ 40.001031
+ ],
+ [
+ -96.52034002239839,
+ 40.001023301131006
+ ],
+ [
+ -96.5013870264352,
+ 40.001001750826006
+ ],
+ [
+ -96.469945,
+ 40.000966
+ ],
+ [
+ -96.467536,
+ 40.001035
+ ],
+ [
+ -96.463712955188,
+ 40.0009682733452
+ ],
+ [
+ -96.4637115714222,
+ 40.0009682491932
+ ],
+ [
+ -96.46364,
+ 40.000967
+ ],
+ [
+ -96.3548205899148,
+ 40.0007357968029
+ ],
+ [
+ -96.35184082580619,
+ 40.0007294658461
+ ],
+ [
+ -96.3507074609262,
+ 40.000727057842
+ ],
+ [
+ -96.34188545199609,
+ 40.0007083141577
+ ],
+ [
+ -96.304555,
+ 40.000629
+ ],
+ [
+ -96.301066,
+ 40.000632
+ ],
+ [
+ -96.2392078816029,
+ 40.000690965796096
+ ],
+ [
+ -96.239172,
+ 40.000691
+ ],
+ [
+ -96.237163439846,
+ 40.0006959778442
+ ],
+ [
+ -96.223839,
+ 40.000729
+ ],
+ [
+ -96.220171,
+ 40.00072
+ ],
+ [
+ -96.1726253323328,
+ 40.000557434653004
+ ],
+ [
+ -96.1543987066932,
+ 40.0004951152479
+ ],
+ [
+ -96.154365,
+ 40.000495
+ ],
+ [
+ -96.154246,
+ 40.00045
+ ],
+ [
+ -96.147167,
+ 40.000479
+ ],
+ [
+ -96.12611825643019,
+ 40.000432401274196
+ ],
+ [
+ -96.125937,
+ 40.000432
+ ],
+ [
+ -96.125788,
+ 40.000467
+ ],
+ [
+ -96.1238965663632,
+ 40.000469731539695
+ ],
+ [
+ -96.089781,
+ 40.000519
+ ],
+ [
+ -96.081395,
+ 40.000603
+ ],
+ [
+ -96.051691,
+ 40.000727
+ ],
+ [
+ -96.02409,
+ 40.000719
+ ],
+ [
+ -96.0147103512153,
+ 40.0006623528518
+ ],
+ [
+ -96.01068007843601,
+ 40.00063801255239
+ ],
+ [
+ -96.010678,
+ 40.000638
+ ],
+ [
+ -95.9729500868875,
+ 40.0005539830634
+ ],
+ [
+ -95.958139,
+ 40.000521
+ ],
+ [
+ -95.9015744668213,
+ 40.000482848956
+ ],
+ [
+ -95.8974000829372,
+ 40.000480033462
+ ],
+ [
+ -95.8825806075692,
+ 40.0004700381801
+ ],
+ [
+ -95.882524,
+ 40.00047
+ ],
+ [
+ -95.8221190079059,
+ 40.000458494287194
+ ],
+ [
+ -95.7881114096839,
+ 40.0004520166495
+ ],
+ [
+ -95.788024,
+ 40.000452
+ ],
+ [
+ -95.784575,
+ 40.000463
+ ],
+ [
+ -95.7844983217301,
+ 40.0004629132654
+ ],
+ [
+ -95.6730020442723,
+ 40.000336794266296
+ ],
+ [
+ -95.6713680045858,
+ 40.000334945922496
+ ],
+ [
+ -95.6586955860156,
+ 40.000320611518006
+ ],
+ [
+ -95.5653760293498,
+ 40.0002150531141
+ ],
+ [
+ -95.5653561812955,
+ 40.000215030663
+ ],
+ [
+ -95.55815600917789,
+ 40.0002068861893
+ ],
+ [
+ -95.4637402450671,
+ 40.000100087810594
+ ],
+ [
+ -95.46306990574179,
+ 40.0000993295564
+ ],
+ [
+ -95.4629975598767,
+ 40.000099247722396
+ ],
+ [
+ -95.45528324486939,
+ 40.000090521676
+ ],
+ [
+ -95.4552421046709,
+ 40.0000904751403
+ ],
+ [
+ -95.4520464831285,
+ 40.0000868604134
+ ],
+ [
+ -95.4385993262094,
+ 40.000071649663695
+ ],
+ [
+ -95.4385061679257,
+ 40.0000715442877
+ ],
+ [
+ -95.4360108722524,
+ 40.0000687217343
+ ],
+ [
+ -95.4359911564387,
+ 40.0000686994328
+ ],
+ [
+ -95.4264001132841,
+ 40.0000578505256
+ ],
+ [
+ -95.42611797772659,
+ 40.000057531388
+ ],
+ [
+ -95.42131809377,
+ 40.0000521019999
+ ],
+ [
+ -95.42130700133501,
+ 40.000052089452694
+ ],
+ [
+ -95.4147859076062,
+ 40.0000447131184
+ ],
+ [
+ -95.41471412371169,
+ 40.0000446319201
+ ],
+ [
+ -95.375257,
+ 40
+ ],
+ [
+ -95.3686439989872,
+ 39.999999812986005
+ ],
+ [
+ -95.339896,
+ 39.999999
+ ],
+ [
+ -95.3264490000134,
+ 39.9999985745428
+ ],
+ [
+ -95.30829,
+ 39.999998
+ ],
+ [
+ -95.3083073417951,
+ 39.9990487648982
+ ],
+ [
+ -95.308404,
+ 39.993758
+ ],
+ [
+ -95.30778,
+ 39.990618
+ ],
+ [
+ -95.307111,
+ 39.989114
+ ],
+ [
+ -95.302507,
+ 39.984357
+ ],
+ [
+ -95.289715,
+ 39.977706
+ ],
+ [
+ -95.274757,
+ 39.972115
+ ],
+ [
+ -95.269886,
+ 39.969396
+ ],
+ [
+ -95.261854,
+ 39.960618
+ ],
+ [
+ -95.257652,
+ 39.954886
+ ],
+ [
+ -95.250254,
+ 39.948644
+ ],
+ [
+ -95.241383,
+ 39.944949
+ ],
+ [
+ -95.236761,
+ 39.943931
+ ],
+ [
+ -95.231114,
+ 39.943784
+ ],
+ [
+ -95.220212,
+ 39.944433
+ ],
+ [
+ -95.21644,
+ 39.943953
+ ],
+ [
+ -95.213737,
+ 39.943206
+ ],
+ [
+ -95.204428,
+ 39.938949
+ ],
+ [
+ -95.201277,
+ 39.934194
+ ],
+ [
+ -95.20069,
+ 39.928155
+ ],
+ [
+ -95.20201,
+ 39.922438
+ ],
+ [
+ -95.205745,
+ 39.915169
+ ],
+ [
+ -95.206326,
+ 39.912121
+ ],
+ [
+ -95.206196,
+ 39.909557
+ ],
+ [
+ -95.205733,
+ 39.908275
+ ],
+ [
+ -95.201935,
+ 39.904053
+ ],
+ [
+ -95.199347,
+ 39.902709
+ ],
+ [
+ -95.193816,
+ 39.90069
+ ],
+ [
+ -95.189565,
+ 39.899959
+ ],
+ [
+ -95.18137994785609,
+ 39.9000423722677
+ ],
+ [
+ -95.179453,
+ 39.900062
+ ],
+ [
+ -95.172296,
+ 39.902026
+ ],
+ [
+ -95.159834,
+ 39.906984
+ ],
+ [
+ -95.156024,
+ 39.907243
+ ],
+ [
+ -95.1531851852736,
+ 39.9066656063969
+ ],
+ [
+ -95.149657,
+ 39.905948
+ ],
+ [
+ -95.146055,
+ 39.904183
+ ],
+ [
+ -95.143802,
+ 39.901918
+ ],
+ [
+ -95.142563,
+ 39.897992
+ ],
+ [
+ -95.142445,
+ 39.89542
+ ],
+ [
+ -95.143403,
+ 39.889356
+ ],
+ [
+ -95.142718,
+ 39.885889
+ ],
+ [
+ -95.140601,
+ 39.881688
+ ],
+ [
+ -95.137092,
+ 39.878351
+ ],
+ [
+ -95.134747,
+ 39.876852
+ ],
+ [
+ -95.13394907387381,
+ 39.8765262094665
+ ],
+ [
+ -95.128166,
+ 39.874165
+ ],
+ [
+ -95.105912,
+ 39.869164
+ ],
+ [
+ -95.090158,
+ 39.86314
+ ],
+ [
+ -95.085003,
+ 39.861883
+ ],
+ [
+ -95.081534,
+ 39.861718
+ ],
+ [
+ -95.052535,
+ 39.864374
+ ],
+ [
+ -95.042142,
+ 39.864805
+ ],
+ [
+ -95.037767,
+ 39.865542
+ ],
+ [
+ -95.032053,
+ 39.868337
+ ],
+ [
+ -95.027931,
+ 39.871522
+ ],
+ [
+ -95.025422,
+ 39.876711
+ ],
+ [
+ -95.025119,
+ 39.878833
+ ],
+ [
+ -95.025947,
+ 39.886747
+ ],
+ [
+ -95.02524,
+ 39.8897
+ ],
+ [
+ -95.024389,
+ 39.891202
+ ],
+ [
+ -95.02189745486949,
+ 39.8939247831128
+ ],
+ [
+ -95.018743,
+ 39.897372
+ ],
+ [
+ -95.013152,
+ 39.899953
+ ],
+ [
+ -95.00844,
+ 39.900596
+ ],
+ [
+ -95.003819,
+ 39.900401
+ ],
+ [
+ -94.99341025106669,
+ 39.8977932373378
+ ],
+ [
+ -94.990284,
+ 39.89701
+ ],
+ [
+ -94.986975,
+ 39.89667
+ ],
+ [
+ -94.977749,
+ 39.897472
+ ],
+ [
+ -94.963345,
+ 39.901136
+ ],
+ [
+ -94.959276,
+ 39.901671
+ ],
+ [
+ -94.95154,
+ 39.900533
+ ],
+ [
+ -94.943867,
+ 39.89813
+ ],
+ [
+ -94.934493,
+ 39.893366
+ ],
+ [
+ -94.929574,
+ 39.888754
+ ],
+ [
+ -94.927897,
+ 39.886112
+ ],
+ [
+ -94.927359,
+ 39.883966
+ ],
+ [
+ -94.927252,
+ 39.880258
+ ],
+ [
+ -94.928466,
+ 39.876344
+ ],
+ [
+ -94.931463,
+ 39.872602
+ ],
+ [
+ -94.938791,
+ 39.866954
+ ],
+ [
+ -94.940743,
+ 39.86441
+ ],
+ [
+ -94.942407,
+ 39.861066
+ ],
+ [
+ -94.942567,
+ 39.856602
+ ],
+ [
+ -94.939767,
+ 39.85193
+ ],
+ [
+ -94.937655,
+ 39.849786
+ ],
+ [
+ -94.92615,
+ 39.841322
+ ],
+ [
+ -94.916918,
+ 39.836138
+ ],
+ [
+ -94.909942,
+ 39.834426
+ ],
+ [
+ -94.903157,
+ 39.83385
+ ],
+ [
+ -94.892677,
+ 39.834378
+ ],
+ [
+ -94.889493,
+ 39.834026
+ ],
+ [
+ -94.886933,
+ 39.833098
+ ],
+ [
+ -94.881013,
+ 39.828922
+ ],
+ [
+ -94.878677,
+ 39.826522
+ ],
+ [
+ -94.877044,
+ 39.823754
+ ],
+ [
+ -94.876544,
+ 39.820594
+ ],
+ [
+ -94.875944,
+ 39.813294
+ ],
+ [
+ -94.876344,
+ 39.806894
+ ],
+ [
+ -94.88066111062189,
+ 39.7979022151039
+ ],
+ [
+ -94.880932,
+ 39.797338
+ ],
+ [
+ -94.884084,
+ 39.794234
+ ],
+ [
+ -94.890292,
+ 39.791626
+ ],
+ [
+ -94.892965,
+ 39.791098
+ ],
+ [
+ -94.925605,
+ 39.789754
+ ],
+ [
+ -94.929654,
+ 39.788282
+ ],
+ [
+ -94.9304724352531,
+ 39.7877491645488
+ ],
+ [
+ -94.932726,
+ 39.786282
+ ],
+ [
+ -94.935206,
+ 39.78313
+ ],
+ [
+ -94.935782,
+ 39.778906
+ ],
+ [
+ -94.935302,
+ 39.77561
+ ],
+ [
+ -94.934262,
+ 39.773642
+ ],
+ [
+ -94.929653,
+ 39.769098
+ ],
+ [
+ -94.926229,
+ 39.76649
+ ],
+ [
+ -94.916789,
+ 39.760938
+ ],
+ [
+ -94.912293,
+ 39.759338
+ ],
+ [
+ -94.906244,
+ 39.759418
+ ],
+ [
+ -94.899156,
+ 39.761258
+ ],
+ [
+ -94.895268,
+ 39.76321
+ ],
+ [
+ -94.895041,
+ 39.76335
+ ],
+ [
+ -94.894071,
+ 39.763946
+ ],
+ [
+ -94.893919,
+ 39.76404
+ ],
+ [
+ -94.893724,
+ 39.76416
+ ],
+ [
+ -94.893646,
+ 39.764208
+ ],
+ [
+ -94.883924,
+ 39.770186
+ ],
+ [
+ -94.88146,
+ 39.771258
+ ],
+ [
+ -94.881422,
+ 39.771258
+ ],
+ [
+ -94.8711583056208,
+ 39.772991583716895
+ ],
+ [
+ -94.871144,
+ 39.772994
+ ],
+ [
+ -94.869644,
+ 39.772894
+ ],
+ [
+ -94.867143,
+ 39.771694
+ ],
+ [
+ -94.865243,
+ 39.770094
+ ],
+ [
+ -94.863143,
+ 39.767294
+ ],
+ [
+ -94.860743,
+ 39.763094
+ ],
+ [
+ -94.859443,
+ 39.753694
+ ],
+ [
+ -94.8594718624509,
+ 39.753564492192396
+ ],
+ [
+ -94.8594779750445,
+ 39.753537064563204
+ ],
+ [
+ -94.860371,
+ 39.74953
+ ],
+ [
+ -94.86056208670941,
+ 39.7490444079578
+ ],
+ [
+ -94.862943,
+ 39.742994
+ ],
+ [
+ -94.870143,
+ 39.734594
+ ],
+ [
+ -94.875643,
+ 39.730494
+ ],
+ [
+ -94.88138648382589,
+ 39.727993895275795
+ ],
+ [
+ -94.884143,
+ 39.726794
+ ],
+ [
+ -94.891744,
+ 39.724894
+ ],
+ [
+ -94.8983476508447,
+ 39.7241509584628
+ ],
+ [
+ -94.899316,
+ 39.724042
+ ],
+ [
+ -94.902612,
+ 39.724202
+ ],
+ [
+ -94.910068,
+ 39.725786
+ ],
+ [
+ -94.918324,
+ 39.728794
+ ],
+ [
+ -94.930005,
+ 39.73537
+ ],
+ [
+ -94.939221,
+ 39.741578
+ ],
+ [
+ -94.944741,
+ 39.744377
+ ],
+ [
+ -94.94865932591769,
+ 39.7455726547844
+ ],
+ [
+ -94.948726,
+ 39.745593
+ ],
+ [
+ -94.95263,
+ 39.745961
+ ],
+ [
+ -94.955286,
+ 39.745689
+ ],
+ [
+ -94.960086,
+ 39.743065
+ ],
+ [
+ -94.9637078450442,
+ 39.7402960053179
+ ],
+ [
+ -94.965318,
+ 39.739065
+ ],
+ [
+ -94.970422,
+ 39.732121
+ ],
+ [
+ -94.971206,
+ 39.729305
+ ],
+ [
+ -94.971078,
+ 39.723146
+ ],
+ [
+ -94.968453,
+ 39.707402
+ ],
+ [
+ -94.96854833075069,
+ 39.7047934040045
+ ],
+ [
+ -94.968981,
+ 39.692954
+ ],
+ [
+ -94.969909,
+ 39.68905
+ ],
+ [
+ -94.971317,
+ 39.68641
+ ],
+ [
+ -94.976325,
+ 39.68137
+ ],
+ [
+ -94.981557,
+ 39.678634
+ ],
+ [
+ -94.984149,
+ 39.67785
+ ],
+ [
+ -94.9918326203371,
+ 39.6768046094779
+ ],
+ [
+ -94.993557,
+ 39.67657
+ ],
+ [
+ -94.99374503271969,
+ 39.6765678124549
+ ],
+ [
+ -95.001379,
+ 39.676479
+ ],
+ [
+ -95.009023,
+ 39.675765
+ ],
+ [
+ -95.01531,
+ 39.674262
+ ],
+ [
+ -95.018318,
+ 39.672869
+ ],
+ [
+ -95.0215131996451,
+ 39.6706373996743
+ ],
+ [
+ -95.024595,
+ 39.668485
+ ],
+ [
+ -95.027644,
+ 39.665454
+ ],
+ [
+ -95.037464,
+ 39.652905
+ ],
+ [
+ -95.039049,
+ 39.649639
+ ],
+ [
+ -95.0399666776936,
+ 39.6487606632574
+ ],
+ [
+ -95.044554,
+ 39.64437
+ ],
+ [
+ -95.049518,
+ 39.637876
+ ],
+ [
+ -95.053367,
+ 39.630347
+ ],
+ [
+ -95.054925,
+ 39.624995
+ ],
+ [
+ -95.055152,
+ 39.621657
+ ],
+ [
+ -95.0543021989172,
+ 39.618602481341796
+ ],
+ [
+ -95.05338996101001,
+ 39.615323540228594
+ ],
+ [
+ -95.053012,
+ 39.613965
+ ],
+ [
+ -95.047911,
+ 39.606288
+ ],
+ [
+ -95.046445,
+ 39.601606
+ ],
+ [
+ -95.046361,
+ 39.599557
+ ],
+ [
+ -95.047165,
+ 39.595117
+ ],
+ [
+ -95.049277,
+ 39.589583
+ ],
+ [
+ -95.054804,
+ 39.582488
+ ],
+ [
+ -95.056897,
+ 39.580567
+ ],
+ [
+ -95.059519,
+ 39.579132
+ ],
+ [
+ -95.064519,
+ 39.577115
+ ],
+ [
+ -95.069315,
+ 39.576218
+ ],
+ [
+ -95.07216,
+ 39.576122
+ ],
+ [
+ -95.076688,
+ 39.576764
+ ],
+ [
+ -95.089515,
+ 39.581028
+ ],
+ [
+ -95.095736,
+ 39.580618
+ ],
+ [
+ -95.0970659946237,
+ 39.5802509547436
+ ],
+ [
+ -95.099095,
+ 39.579691
+ ],
+ [
+ -95.103228,
+ 39.577783
+ ],
+ [
+ -95.106406,
+ 39.575252
+ ],
+ [
+ -95.107454,
+ 39.573843
+ ],
+ [
+ -95.11289167504519,
+ 39.559617817728004
+ ],
+ [
+ -95.113077,
+ 39.559133
+ ],
+ [
+ -95.113557,
+ 39.553941
+ ],
+ [
+ -95.109304,
+ 39.542285
+ ],
+ [
+ -95.106596,
+ 39.537657
+ ],
+ [
+ -95.1063131332003,
+ 39.537328209302395
+ ],
+ [
+ -95.102888,
+ 39.533347
+ ],
+ [
+ -95.096816339113,
+ 39.5279180384881
+ ],
+ [
+ -95.092704,
+ 39.524241
+ ],
+ [
+ -95.082714,
+ 39.516712
+ ],
+ [
+ -95.077441,
+ 39.513552
+ ],
+ [
+ -95.059461,
+ 39.506143
+ ],
+ [
+ -95.05638,
+ 39.503972
+ ],
+ [
+ -95.052177,
+ 39.499996
+ ],
+ [
+ -95.050552,
+ 39.497514
+ ],
+ [
+ -95.049845,
+ 39.494415
+ ],
+ [
+ -95.04837,
+ 39.48042
+ ],
+ [
+ -95.047133,
+ 39.474971
+ ],
+ [
+ -95.045716,
+ 39.472459
+ ],
+ [
+ -95.04078,
+ 39.466387
+ ],
+ [
+ -95.0375,
+ 39.463689
+ ],
+ [
+ -95.033408,
+ 39.460876
+ ],
+ [
+ -95.028498,
+ 39.458287
+ ],
+ [
+ -95.015825,
+ 39.452809
+ ],
+ [
+ -95.0003628256837,
+ 39.4492358246519
+ ],
+ [
+ -94.995768,
+ 39.448174
+ ],
+ [
+ -94.990172,
+ 39.446192
+ ],
+ [
+ -94.982144,
+ 39.440552
+ ],
+ [
+ -94.978798,
+ 39.436241
+ ],
+ [
+ -94.976606,
+ 39.426701
+ ],
+ [
+ -94.972952,
+ 39.421705
+ ],
+ [
+ -94.96884862177319,
+ 39.4190729027552
+ ],
+ [
+ -94.966066,
+ 39.417288
+ ],
+ [
+ -94.954817,
+ 39.413844
+ ],
+ [
+ -94.951209,
+ 39.411707
+ ],
+ [
+ -94.947864,
+ 39.408604
+ ],
+ [
+ -94.946293,
+ 39.405646
+ ],
+ [
+ -94.946662,
+ 39.399717
+ ],
+ [
+ -94.946227,
+ 39.395648
+ ],
+ [
+ -94.945577,
+ 39.393851
+ ],
+ [
+ -94.942039,
+ 39.389499
+ ],
+ [
+ -94.939697,
+ 39.38795
+ ],
+ [
+ -94.93819984904401,
+ 39.3871132701038
+ ],
+ [
+ -94.9378575597477,
+ 39.3869219709658
+ ],
+ [
+ -94.937158,
+ 39.386531
+ ],
+ [
+ -94.933652,
+ 39.385546
+ ],
+ [
+ -94.9331272669672,
+ 39.38549353665179
+ ],
+ [
+ -94.92311,
+ 39.384492
+ ],
+ [
+ -94.919225,
+ 39.385174
+ ],
+ [
+ -94.915859,
+ 39.386348
+ ],
+ [
+ -94.909581,
+ 39.388865
+ ],
+ [
+ -94.901823,
+ 39.392798
+ ],
+ [
+ -94.894979,
+ 39.393565
+ ],
+ [
+ -94.8928566011499,
+ 39.3933943412539
+ ],
+ [
+ -94.891845,
+ 39.393313
+ ],
+ [
+ -94.888972,
+ 39.392432
+ ],
+ [
+ -94.885026,
+ 39.389801
+ ],
+ [
+ -94.880979,
+ 39.383899
+ ],
+ [
+ -94.8802294902858,
+ 39.38208084304309
+ ],
+ [
+ -94.879281,
+ 39.37978
+ ],
+ [
+ -94.879088,
+ 39.375703
+ ],
+ [
+ -94.88136,
+ 39.370383
+ ],
+ [
+ -94.885216,
+ 39.366911
+ ],
+ [
+ -94.890928,
+ 39.364031
+ ],
+ [
+ -94.896832,
+ 39.363135
+ ],
+ [
+ -94.899024,
+ 39.362431
+ ],
+ [
+ -94.902497,
+ 39.360383
+ ],
+ [
+ -94.907297,
+ 39.356735
+ ],
+ [
+ -94.909409,
+ 39.354255
+ ],
+ [
+ -94.910017,
+ 39.352543
+ ],
+ [
+ -94.91016417217429,
+ 39.351550531235
+ ],
+ [
+ -94.910641,
+ 39.348335
+ ],
+ [
+ -94.9100555120918,
+ 39.3427274077364
+ ],
+ [
+ -94.9098137763421,
+ 39.3404121498112
+ ],
+ [
+ -94.90969665760569,
+ 39.3392904287454
+ ],
+ [
+ -94.9086980811043,
+ 39.3297264227506
+ ],
+ [
+ -94.908065,
+ 39.323663
+ ],
+ [
+ -94.9066023350017,
+ 39.3174023019755
+ ],
+ [
+ -94.90598367981909,
+ 39.3147542497665
+ ],
+ [
+ -94.905329,
+ 39.311952
+ ],
+ [
+ -94.903137,
+ 39.306272
+ ],
+ [
+ -94.9007245523984,
+ 39.3015221031679
+ ],
+ [
+ -94.900049,
+ 39.300192
+ ],
+ [
+ -94.895217,
+ 39.294208
+ ],
+ [
+ -94.8895032295975,
+ 39.288797386390094
+ ],
+ [
+ -94.887056,
+ 39.28648
+ ],
+ [
+ -94.882576,
+ 39.283328
+ ],
+ [
+ -94.87832,
+ 39.281136
+ ],
+ [
+ -94.867568,
+ 39.277841
+ ],
+ [
+ -94.8577715363187,
+ 39.27409265795119
+ ],
+ [
+ -94.857072,
+ 39.273825
+ ],
+ [
+ -94.8506188963092,
+ 39.2706176538204
+ ],
+ [
+ -94.84632,
+ 39.268481
+ ],
+ [
+ -94.837855,
+ 39.262417
+ ],
+ [
+ -94.83550618520779,
+ 39.2601564865158
+ ],
+ [
+ -94.831471,
+ 39.256273
+ ],
+ [
+ -94.827487,
+ 39.249889
+ ],
+ [
+ -94.8265718609918,
+ 39.2457949570685
+ ],
+ [
+ -94.8263515884524,
+ 39.244809527287096
+ ],
+ [
+ -94.825663,
+ 39.241729
+ ],
+ [
+ -94.826111,
+ 39.238289
+ ],
+ [
+ -94.827791,
+ 39.234001
+ ],
+ [
+ -94.834896,
+ 39.223842
+ ],
+ [
+ -94.835056,
+ 39.220658
+ ],
+ [
+ -94.8349645279192,
+ 39.2204838138037
+ ],
+ [
+ -94.833552,
+ 39.217794
+ ],
+ [
+ -94.831679,
+ 39.215938
+ ],
+ [
+ -94.823791,
+ 39.209874
+ ],
+ [
+ -94.820687,
+ 39.208626
+ ],
+ [
+ -94.811663,
+ 39.206594
+ ],
+ [
+ -94.799663,
+ 39.206018
+ ],
+ [
+ -94.78910034371489,
+ 39.207430926749794
+ ],
+ [
+ -94.787343,
+ 39.207666
+ ],
+ [
+ -94.783838,
+ 39.207154
+ ],
+ [
+ -94.781518,
+ 39.206146
+ ],
+ [
+ -94.777838,
+ 39.203522
+ ],
+ [
+ -94.7755431917742,
+ 39.2006085912959
+ ],
+ [
+ -94.775538,
+ 39.200602
+ ],
+ [
+ -94.7710622205379,
+ 39.191478295712
+ ],
+ [
+ -94.770338,
+ 39.190002
+ ],
+ [
+ -94.763138,
+ 39.179903
+ ],
+ [
+ -94.752338,
+ 39.173203
+ ],
+ [
+ -94.741938,
+ 39.170203
+ ],
+ [
+ -94.74192558188149,
+ 39.1702007007742
+ ],
+ [
+ -94.736537,
+ 39.169203
+ ],
+ [
+ -94.723637,
+ 39.169003
+ ],
+ [
+ -94.714137,
+ 39.170403
+ ],
+ [
+ -94.696332,
+ 39.178563
+ ],
+ [
+ -94.6961658533253,
+ 39.1786532335722
+ ],
+ [
+ -94.687236,
+ 39.183503
+ ],
+ [
+ -94.6803378590674,
+ 39.184302784456
+ ],
+ [
+ -94.680336,
+ 39.184303
+ ],
+ [
+ -94.669135,
+ 39.182003
+ ],
+ [
+ -94.663835,
+ 39.179103
+ ],
+ [
+ -94.6596270849113,
+ 39.174621340809594
+ ],
+ [
+ -94.659162,
+ 39.174126
+ ],
+ [
+ -94.660315,
+ 39.168051
+ ],
+ [
+ -94.661397,
+ 39.162742
+ ],
+ [
+ -94.65921,
+ 39.157841
+ ],
+ [
+ -94.655787,
+ 39.15568
+ ],
+ [
+ -94.650735,
+ 39.154103
+ ],
+ [
+ -94.6506467177443,
+ 39.15409980907509
+ ],
+ [
+ -94.639779,
+ 39.153707
+ ],
+ [
+ -94.623934,
+ 39.156603
+ ],
+ [
+ -94.62335638359001,
+ 39.156845456270794
+ ],
+ [
+ -94.615834,
+ 39.160003
+ ],
+ [
+ -94.608657,
+ 39.161044
+ ],
+ [
+ -94.601733,
+ 39.159603
+ ],
+ [
+ -94.596033,
+ 39.157703
+ ],
+ [
+ -94.590661,
+ 39.154767
+ ],
+ [
+ -94.588413,
+ 39.149869
+ ],
+ [
+ -94.589898,
+ 39.138979
+ ],
+ [
+ -94.592533,
+ 39.135903
+ ],
+ [
+ -94.600434,
+ 39.128503
+ ],
+ [
+ -94.605734,
+ 39.122204
+ ],
+ [
+ -94.60829,
+ 39.117944
+ ],
+ [
+ -94.607354,
+ 39.113444
+ ],
+ [
+ -94.6072345427118,
+ 39.0897118187523
+ ],
+ [
+ -94.607234,
+ 39.089604
+ ],
+ [
+ -94.60731377202819,
+ 39.083302009772495
+ ],
+ [
+ -94.607334,
+ 39.081704
+ ],
+ [
+ -94.6072761897973,
+ 39.0724543675638
+ ],
+ [
+ -94.6072753040365,
+ 39.0723126458441
+ ],
+ [
+ -94.607234,
+ 39.065704
+ ],
+ [
+ -94.6073437016326,
+ 39.0573369567546
+ ],
+ [
+ -94.6073826595805,
+ 39.05436559865001
+ ],
+ [
+ -94.60743678384439,
+ 39.050237491838004
+ ],
+ [
+ -94.6074367992711,
+ 39.0502363152334
+ ],
+ [
+ -94.60748648520449,
+ 39.046446723923395
+ ],
+ [
+ -94.6075101495286,
+ 39.0446418244116
+ ],
+ [
+ -94.6075174403161,
+ 39.044085749416595
+ ],
+ [
+ -94.6075340394541,
+ 39.0428197180791
+ ],
+ [
+ -94.6075592794477,
+ 39.040894640813804
+ ],
+ [
+ -94.60761221213889,
+ 39.0368574163357
+ ],
+ [
+ -94.6076467216309,
+ 39.034225346012995
+ ],
+ [
+ -94.607646894661,
+ 39.034212148848894
+ ],
+ [
+ -94.60765145526209,
+ 39.0338643076529
+ ],
+ [
+ -94.6076919614671,
+ 39.0307748625741
+ ],
+ [
+ -94.6077238055933,
+ 39.028346082125296
+ ],
+ [
+ -94.60781889737409,
+ 39.021093345551904
+ ],
+ [
+ -94.6078965853412,
+ 39.015168013681794
+ ],
+ [
+ -94.60789662202869,
+ 39.0151652154864
+ ],
+ [
+ -94.6079129714016,
+ 39.013918233952595
+ ],
+ [
+ -94.60792790646909,
+ 39.012779122781396
+ ],
+ [
+ -94.607992364788,
+ 39.007862828196195
+ ],
+ [
+ -94.6080886032503,
+ 39.0005226331882
+ ],
+ [
+ -94.6080930837859,
+ 39.0001808986646
+ ],
+ [
+ -94.6080936633778,
+ 39.0001366926659
+ ],
+ [
+ -94.6081871532949,
+ 38.9930061316929
+ ],
+ [
+ -94.6082577394965,
+ 38.9876224579304
+ ],
+ [
+ -94.6082838320152,
+ 38.9856323578061
+ ],
+ [
+ -94.6083049915942,
+ 38.984018497484
+ ],
+ [
+ -94.608334,
+ 38.981806
+ ],
+ [
+ -94.6083185155548,
+ 38.9787245953992
+ ],
+ [
+ -94.6082982907429,
+ 38.9746998578355
+ ],
+ [
+ -94.6082621080248,
+ 38.9674994969446
+ ],
+ [
+ -94.6082499088855,
+ 38.965071868204305
+ ],
+ [
+ -94.60820799442169,
+ 38.9567308899182
+ ],
+ [
+ -94.6082079478056,
+ 38.9567216133276
+ ],
+ [
+ -94.608170778496,
+ 38.9493249207111
+ ],
+ [
+ -94.6081343268975,
+ 38.9420710526083
+ ],
+ [
+ -94.608134,
+ 38.942006
+ ],
+ [
+ -94.608134,
+ 38.940006
+ ],
+ [
+ -94.607866,
+ 38.937398
+ ],
+ [
+ -94.607978,
+ 38.93687
+ ],
+ [
+ -94.6079780228435,
+ 38.936847961008006
+ ],
+ [
+ -94.6079780238428,
+ 38.93684699691519
+ ],
+ [
+ -94.6079797993633,
+ 38.9351340070476
+ ],
+ [
+ -94.6079859071513,
+ 38.929241324210004
+ ],
+ [
+ -94.6079952007756,
+ 38.920275004354096
+ ],
+ [
+ -94.6080028197668,
+ 38.9129243402843
+ ],
+ [
+ -94.6080092743906,
+ 38.90669703656201
+ ],
+ [
+ -94.6080103801164,
+ 38.90563025244369
+ ],
+ [
+ -94.60801759440719,
+ 38.898670035857194
+ ],
+ [
+ -94.6080256044729,
+ 38.8909420700723
+ ],
+ [
+ -94.60802799130869,
+ 38.888639294334695
+ ],
+ [
+ -94.60803298406229,
+ 38.883822376370595
+ ],
+ [
+ -94.608033,
+ 38.883807
+ ],
+ [
+ -94.608033,
+ 38.8697490133333
+ ],
+ [
+ -94.608033,
+ 38.869207
+ ],
+ [
+ -94.608033,
+ 38.868107
+ ],
+ [
+ -94.607993,
+ 38.867271
+ ],
+ [
+ -94.608033,
+ 38.861207
+ ],
+ [
+ -94.608033,
+ 38.859882
+ ],
+ [
+ -94.608033,
+ 38.855007
+ ],
+ [
+ -94.608033,
+ 38.855005
+ ],
+ [
+ -94.608033,
+ 38.8501947647058
+ ],
+ [
+ -94.608033,
+ 38.847207
+ ],
+ [
+ -94.6077362254334,
+ 38.8329159953185
+ ],
+ [
+ -94.60771118109629,
+ 38.83171
+ ],
+ [
+ -94.6076708543136,
+ 38.829768087497904
+ ],
+ [
+ -94.607625,
+ 38.82756
+ ],
+ [
+ -94.60766897935889,
+ 38.8258160492682
+ ],
+ [
+ -94.60767342128659,
+ 38.825639909751196
+ ],
+ [
+ -94.6079064830849,
+ 38.8163981130555
+ ],
+ [
+ -94.6080401871738,
+ 38.811096231684296
+ ],
+ [
+ -94.6080403019893,
+ 38.8110916788087
+ ],
+ [
+ -94.608041,
+ 38.811064
+ ],
+ [
+ -94.60846261333329,
+ 38.7897585556789
+ ],
+ [
+ -94.6086143301303,
+ 38.7820918299973
+ ],
+ [
+ -94.6089087880617,
+ 38.76721194702019
+ ],
+ [
+ -94.6090394225148,
+ 38.7606105783075
+ ],
+ [
+ -94.609399,
+ 38.74244
+ ],
+ [
+ -94.609456,
+ 38.7407
+ ],
+ [
+ -94.60950894217369,
+ 38.7381018369191
+ ],
+ [
+ -94.6098429160402,
+ 38.7217119060145
+ ],
+ [
+ -94.6108431558583,
+ 38.6726246475414
+ ],
+ [
+ -94.611602,
+ 38.635384
+ ],
+ [
+ -94.6115934734416,
+ 38.6347384088296
+ ],
+ [
+ -94.611465,
+ 38.625011
+ ],
+ [
+ -94.61185471465589,
+ 38.620522835794304
+ ],
+ [
+ -94.611858,
+ 38.620485
+ ],
+ [
+ -94.611908,
+ 38.609272
+ ],
+ [
+ -94.61190556214929,
+ 38.605890004619
+ ],
+ [
+ -94.6118870691562,
+ 38.5802349394003
+ ],
+ [
+ -94.611887,
+ 38.580139
+ ],
+ [
+ -94.611902,
+ 38.58011
+ ],
+ [
+ -94.612176,
+ 38.576546
+ ],
+ [
+ -94.6121681722468,
+ 38.565533999166696
+ ],
+ [
+ -94.612157,
+ 38.549817
+ ],
+ [
+ -94.612272,
+ 38.547917
+ ],
+ [
+ -94.6122740486503,
+ 38.547607097579096
+ ],
+ [
+ -94.61245313241301,
+ 38.5205168272041
+ ],
+ [
+ -94.6124647571677,
+ 38.5187583330626
+ ],
+ [
+ -94.6125468238849,
+ 38.5063439772091
+ ],
+ [
+ -94.6126162649856,
+ 38.495839517380894
+ ],
+ [
+ -94.61264264999349,
+ 38.4918482175133
+ ],
+ [
+ -94.612644,
+ 38.491644
+ ],
+ [
+ -94.612726,
+ 38.484367
+ ],
+ [
+ -94.612696,
+ 38.483154
+ ],
+ [
+ -94.6128650452802,
+ 38.477602354122006
+ ],
+ [
+ -94.612866,
+ 38.477571
+ ],
+ [
+ -94.61288440004539,
+ 38.474836841746594
+ ],
+ [
+ -94.6131579346001,
+ 38.4341909225274
+ ],
+ [
+ -94.613341647891,
+ 38.4068920110898
+ ],
+ [
+ -94.613365,
+ 38.403422
+ ],
+ [
+ -94.6133327609411,
+ 38.3998769930798
+ ],
+ [
+ -94.613265,
+ 38.392426
+ ],
+ [
+ -94.613275403738,
+ 38.3887183678658
+ ],
+ [
+ -94.613329,
+ 38.369618
+ ],
+ [
+ -94.613312,
+ 38.364407
+ ],
+ [
+ -94.613,
+ 38.335801
+ ],
+ [
+ -94.612825,
+ 38.324387
+ ],
+ [
+ -94.612788,
+ 38.320142
+ ],
+ [
+ -94.612673,
+ 38.314832
+ ],
+ [
+ -94.612673,
+ 38.3131160055866
+ ],
+ [
+ -94.612673,
+ 38.302527
+ ],
+ [
+ -94.612689368933,
+ 38.301464072326795
+ ],
+ [
+ -94.612844,
+ 38.291423
+ ],
+ [
+ -94.612849,
+ 38.289914
+ ],
+ [
+ -94.6128243473455,
+ 38.2868489056335
+ ],
+ [
+ -94.612708076549,
+ 38.272392816792696
+ ],
+ [
+ -94.6126922711167,
+ 38.2704277082702
+ ],
+ [
+ -94.612692,
+ 38.270394
+ ],
+ [
+ -94.612614,
+ 38.237766
+ ],
+ [
+ -94.61261420800079,
+ 38.237659236141404
+ ],
+ [
+ -94.612635,
+ 38.226987
+ ],
+ [
+ -94.612659,
+ 38.219251
+ ],
+ [
+ -94.6126585759973,
+ 38.2185717476496
+ ],
+ [
+ -94.6126585742788,
+ 38.218568994647796
+ ],
+ [
+ -94.612658,
+ 38.217649
+ ],
+ [
+ -94.6127231579095,
+ 38.2121936142959
+ ],
+ [
+ -94.612822,
+ 38.203918
+ ],
+ [
+ -94.612848,
+ 38.200714
+ ],
+ [
+ -94.613073,
+ 38.190552
+ ],
+ [
+ -94.61342068719159,
+ 38.16799317831789
+ ],
+ [
+ -94.613422,
+ 38.167908
+ ],
+ [
+ -94.613748,
+ 38.160633
+ ],
+ [
+ -94.613856,
+ 38.149769
+ ],
+ [
+ -94.6139190234501,
+ 38.124428654138
+ ],
+ [
+ -94.6139350083481,
+ 38.118001477540005
+ ],
+ [
+ -94.614061,
+ 38.067343
+ ],
+ [
+ -94.614089,
+ 38.065901
+ ],
+ [
+ -94.614055,
+ 38.060088
+ ],
+ [
+ -94.6140548972091,
+ 38.0600558584152
+ ],
+ [
+ -94.6139813464919,
+ 38.0370573442828
+ ],
+ [
+ -94.613981,
+ 38.036949
+ ],
+ [
+ -94.614212,
+ 37.992462
+ ],
+ [
+ -94.614465,
+ 37.987799
+ ],
+ [
+ -94.6144667122243,
+ 37.9874870401816
+ ],
+ [
+ -94.61451784495809,
+ 37.9781708783997
+ ],
+ [
+ -94.614557,
+ 37.971037
+ ],
+ [
+ -94.614562,
+ 37.951517
+ ],
+ [
+ -94.614594,
+ 37.949978
+ ],
+ [
+ -94.614612,
+ 37.944362
+ ],
+ [
+ -94.614622630243,
+ 37.944093024908
+ ],
+ [
+ -94.614754,
+ 37.940769
+ ],
+ [
+ -94.614835,
+ 37.9367
+ ],
+ [
+ -94.614778,
+ 37.9342
+ ],
+ [
+ -94.615181,
+ 37.915944
+ ],
+ [
+ -94.6153919347055,
+ 37.9064399985508
+ ],
+ [
+ -94.615393,
+ 37.906392
+ ],
+ [
+ -94.615469,
+ 37.901775
+ ],
+ [
+ -94.615706,
+ 37.886843
+ ],
+ [
+ -94.615921,
+ 37.878331
+ ],
+ [
+ -94.61592061940961,
+ 37.8783055354428
+ ],
+ [
+ -94.615834,
+ 37.87251
+ ],
+ [
+ -94.616,
+ 37.863126
+ ],
+ [
+ -94.6161229483499,
+ 37.8579760226405
+ ],
+ [
+ -94.61627394868589,
+ 37.8516510226485
+ ],
+ [
+ -94.616426,
+ 37.845282
+ ],
+ [
+ -94.6164336071915,
+ 37.8428343861276
+ ],
+ [
+ -94.61645,
+ 37.83756
+ ],
+ [
+ -94.616862,
+ 37.819456
+ ],
+ [
+ -94.61766750495559,
+ 37.7758649599915
+ ],
+ [
+ -94.617721,
+ 37.77297
+ ],
+ [
+ -94.6177230528424,
+ 37.7719491710375
+ ],
+ [
+ -94.6177445841091,
+ 37.7612421918332
+ ],
+ [
+ -94.6177561473026,
+ 37.755492094811196
+ ],
+ [
+ -94.617808,
+ 37.729707
+ ],
+ [
+ -94.617975,
+ 37.722176
+ ],
+ [
+ -94.617805,
+ 37.690178
+ ],
+ [
+ -94.617651,
+ 37.687671
+ ],
+ [
+ -94.617687,
+ 37.686653
+ ],
+ [
+ -94.617885,
+ 37.682214
+ ],
+ [
+ -94.617734,
+ 37.673127
+ ],
+ [
+ -94.6177338243197,
+ 37.6731053668666
+ ],
+ [
+ -94.617576,
+ 37.653671
+ ],
+ [
+ -94.6175754334997,
+ 37.6535765775648
+ ],
+ [
+ -94.617517927194,
+ 37.6439916123997
+ ],
+ [
+ -94.617477,
+ 37.63717
+ ],
+ [
+ -94.61747282034969,
+ 37.636540100723394
+ ],
+ [
+ -94.6173,
+ 37.610495
+ ],
+ [
+ -94.617428,
+ 37.609522
+ ],
+ [
+ -94.617283,
+ 37.571896
+ ],
+ [
+ -94.617315,
+ 37.571499
+ ],
+ [
+ -94.6172713518772,
+ 37.570662224448895
+ ],
+ [
+ -94.61708336085559,
+ 37.56705825982159
+ ],
+ [
+ -94.617081,
+ 37.567013
+ ],
+ [
+ -94.6171116802523,
+ 37.5632439892571
+ ],
+ [
+ -94.6171429535687,
+ 37.559402121724005
+ ],
+ [
+ -94.61716,
+ 37.557308
+ ],
+ [
+ -94.6171833328591,
+ 37.5538771722873
+ ],
+ [
+ -94.617186,
+ 37.553485
+ ],
+ [
+ -94.617167587099,
+ 37.551784058595295
+ ],
+ [
+ -94.616908,
+ 37.527804
+ ],
+ [
+ -94.616789,
+ 37.52151
+ ],
+ [
+ -94.6168795106816,
+ 37.5069103176214
+ ],
+ [
+ -94.616974599203,
+ 37.491572214022
+ ],
+ [
+ -94.617023,
+ 37.483765
+ ],
+ [
+ -94.61709095990248,
+ 37.477776033587496
+ ],
+ [
+ -94.617183,
+ 37.469665
+ ],
+ [
+ -94.61718,
+ 37.465203
+ ],
+ [
+ -94.617222,
+ 37.460476
+ ],
+ [
+ -94.617205,
+ 37.460373
+ ],
+ [
+ -94.617201,
+ 37.454788
+ ],
+ [
+ -94.6172009810493,
+ 37.4547838885303
+ ],
+ [
+ -94.6171330584416,
+ 37.4400476358028
+ ],
+ [
+ -94.617132,
+ 37.439818
+ ],
+ [
+ -94.6172646092591,
+ 37.4255779591116
+ ],
+ [
+ -94.617265,
+ 37.425536
+ ],
+ [
+ -94.6175101773665,
+ 37.410957913250094
+ ],
+ [
+ -94.617511,
+ 37.410909
+ ],
+ [
+ -94.617557,
+ 37.396375
+ ],
+ [
+ -94.617625,
+ 37.367576
+ ],
+ [
+ -94.617626,
+ 37.367445
+ ],
+ [
+ -94.617537,
+ 37.364355
+ ],
+ [
+ -94.61753771716201,
+ 37.3641671035633
+ ],
+ [
+ -94.617636,
+ 37.338417
+ ],
+ [
+ -94.61763608310468,
+ 37.3384147815258
+ ],
+ [
+ -94.617695,
+ 37.336842
+ ],
+ [
+ -94.617648,
+ 37.323589
+ ],
+ [
+ -94.6177022670765,
+ 37.3130211540779
+ ],
+ [
+ -94.6179646084029,
+ 37.2619334062597
+ ],
+ [
+ -94.618075,
+ 37.240436
+ ],
+ [
+ -94.618158,
+ 37.237597
+ ],
+ [
+ -94.618123,
+ 37.229334
+ ],
+ [
+ -94.61815,
+ 37.228121
+ ],
+ [
+ -94.618219,
+ 37.207772
+ ],
+ [
+ -94.618305,
+ 37.207337
+ ],
+ [
+ -94.618305110723,
+ 37.2071901891997
+ ],
+ [
+ -94.6183145404829,
+ 37.1946870011618
+ ],
+ [
+ -94.618319,
+ 37.188774
+ ],
+ [
+ -94.618505,
+ 37.181184
+ ],
+ [
+ -94.6185046748114,
+ 37.1811189419566
+ ],
+ [
+ -94.6185045609479,
+ 37.181096162146694
+ ],
+ [
+ -94.618473,
+ 37.174782
+ ],
+ [
+ -94.618351,
+ 37.160211
+ ],
+ [
+ -94.6183507189726,
+ 37.160182931508196
+ ],
+ [
+ -94.6182799572213,
+ 37.1531153796718
+ ],
+ [
+ -94.6180860375513,
+ 37.1337470444625
+ ],
+ [
+ -94.618072,
+ 37.132345
+ ],
+ [
+ -94.618075,
+ 37.129755
+ ],
+ [
+ -94.61807555752729,
+ 37.129687502575
+ ],
+ [
+ -94.6181644144415,
+ 37.1189299786433
+ ],
+ [
+ -94.618212,
+ 37.113169
+ ],
+ [
+ -94.618151,
+ 37.103968
+ ],
+ [
+ -94.618059,
+ 37.096676
+ ],
+ [
+ -94.618088,
+ 37.093671
+ ],
+ [
+ -94.61809,
+ 37.093494
+ ],
+ [
+ -94.61808525509939,
+ 37.089305438998196
+ ],
+ [
+ -94.618082,
+ 37.086432
+ ],
+ [
+ -94.6181193858,
+ 37.08594204925289
+ ],
+ [
+ -94.61812,
+ 37.085934
+ ],
+ [
+ -94.618029560687,
+ 37.0788187853574
+ ],
+ [
+ -94.617982,
+ 37.075077
+ ],
+ [
+ -94.6179542534055,
+ 37.070337
+ ],
+ [
+ -94.6178941719072,
+ 37.060073170948
+ ],
+ [
+ -94.617875,
+ 37.056798
+ ],
+ [
+ -94.6178750047381,
+ 37.0567971439288
+ ],
+ [
+ -94.6178773083054,
+ 37.056380940511296
+ ],
+ [
+ -94.617965,
+ 37.040537
+ ],
+ [
+ -94.61797240648849,
+ 37.0327550025537
+ ],
+ [
+ -94.6179724141127,
+ 37.0327469918284
+ ],
+ [
+ -94.61797414727128,
+ 37.0309259620703
+ ],
+ [
+ -94.6179920228963,
+ 37.0121440428504
+ ],
+ [
+ -94.617995,
+ 37.009016
+ ],
+ [
+ -94.617964,
+ 36.998905
+ ],
+ [
+ -94.625224,
+ 36.998672
+ ],
+ [
+ -94.699735,
+ 36.998805
+ ],
+ [
+ -94.701797,
+ 36.998814
+ ],
+ [
+ -94.7112698230604,
+ 36.9987967343059
+ ],
+ [
+ -94.71277,
+ 36.998794
+ ],
+ [
+ -94.72269437176989,
+ 36.9987415589252
+ ],
+ [
+ -94.73281925983179,
+ 36.9986880583083
+ ],
+ [
+ -94.7361029816463,
+ 36.9986707068925
+ ],
+ [
+ -94.737183,
+ 36.998665
+ ],
+ [
+ -94.739324,
+ 36.998687
+ ],
+ [
+ -94.7459908664537,
+ 36.9987005330376
+ ],
+ [
+ -94.74984092955219,
+ 36.9987083482608
+ ],
+ [
+ -94.7770423004622,
+ 36.9987635641825
+ ],
+ [
+ -94.777257,
+ 36.998764
+ ],
+ [
+ -94.8089699358697,
+ 36.9987921772749
+ ],
+ [
+ -94.83128,
+ 36.998812
+ ],
+ [
+ -94.8315429216352,
+ 36.9988125723983
+ ],
+ [
+ -94.840926,
+ 36.998833
+ ],
+ [
+ -94.8443678174579,
+ 36.998849675848
+ ],
+ [
+ -94.849801,
+ 36.998876
+ ],
+ [
+ -94.853197,
+ 36.998874
+ ],
+ [
+ -94.8668896445243,
+ 36.9989371170629
+ ],
+ [
+ -94.9043821552165,
+ 36.9991099410305
+ ],
+ [
+ -94.9406118246384,
+ 36.999276943855804
+ ],
+ [
+ -94.995293,
+ 36.999529
+ ],
+ [
+ -95.00762,
+ 36.999514
+ ],
+ [
+ -95.011433,
+ 36.999535
+ ],
+ [
+ -95.030324,
+ 36.999517
+ ],
+ [
+ -95.0349534669929,
+ 36.9995047088358
+ ],
+ [
+ -95.037857,
+ 36.999497
+ ],
+ [
+ -95.049499,
+ 36.99958
+ ],
+ [
+ -95.0735038728895,
+ 36.999509015161394
+ ],
+ [
+ -95.073509,
+ 36.999509
+ ],
+ [
+ -95.1221400136406,
+ 36.9995268619752
+ ],
+ [
+ -95.1404610155766,
+ 36.9995335912053
+ ],
+ [
+ -95.155187,
+ 36.999539
+ ],
+ [
+ -95.155372,
+ 36.99954
+ ],
+ [
+ -95.1589689477582,
+ 36.9995367194603
+ ],
+ [
+ -95.177301,
+ 36.99952
+ ],
+ [
+ -95.195307,
+ 36.999565
+ ],
+ [
+ -95.26787587305601,
+ 36.9994469582523
+ ],
+ [
+ -95.28607980862431,
+ 36.999417347425
+ ],
+ [
+ -95.322565,
+ 36.999358
+ ],
+ [
+ -95.328058,
+ 36.999365
+ ],
+ [
+ -95.328327,
+ 36.999366
+ ],
+ [
+ -95.33121,
+ 36.99938
+ ],
+ [
+ -95.3772578842198,
+ 36.9992963017548
+ ],
+ [
+ -95.40757195069268,
+ 36.9992412018471
+ ],
+ [
+ -95.407683,
+ 36.999241
+ ],
+ [
+ -95.511578,
+ 36.999235
+ ],
+ [
+ -95.5224149880945,
+ 36.9992810582678
+ ],
+ [
+ -95.534401,
+ 36.999332
+ ],
+ [
+ -95.573598,
+ 36.99931
+ ],
+ [
+ -95.5889899910403,
+ 36.9993143929195
+ ],
+ [
+ -95.601517061574,
+ 36.9993179681822
+ ],
+ [
+ -95.61214,
+ 36.999321
+ ],
+ [
+ -95.6157410865682,
+ 36.99936276273301
+ ],
+ [
+ -95.615934,
+ 36.999365
+ ],
+ [
+ -95.6210117300348,
+ 36.9993619832878
+ ],
+ [
+ -95.62435,
+ 36.99936
+ ],
+ [
+ -95.6287496081096,
+ 36.9993292818425
+ ],
+ [
+ -95.630079,
+ 36.99932
+ ],
+ [
+ -95.63798400383018,
+ 36.9993204619837
+ ],
+ [
+ -95.6423696517221,
+ 36.999320718289496
+ ],
+ [
+ -95.66041999977949,
+ 36.99932177318679
+ ],
+ [
+ -95.664301,
+ 36.999322
+ ],
+ [
+ -95.6740419235188,
+ 36.9993338732759
+ ],
+ [
+ -95.686452,
+ 36.999349
+ ],
+ [
+ -95.696659,
+ 36.999215
+ ],
+ [
+ -95.71038,
+ 36.999371
+ ],
+ [
+ -95.71050654370059,
+ 36.9993684169025
+ ],
+ [
+ -95.714887,
+ 36.999279
+ ],
+ [
+ -95.718054,
+ 36.999255
+ ],
+ [
+ -95.741908,
+ 36.999244
+ ],
+ [
+ -95.7464701516561,
+ 36.9992508443682
+ ],
+ [
+ -95.754790411229,
+ 36.999263326838005
+ ],
+ [
+ -95.759905,
+ 36.999271
+ ],
+ [
+ -95.7599913230711,
+ 36.9992703536053
+ ],
+ [
+ -95.768719,
+ 36.999205
+ ],
+ [
+ -95.786762,
+ 36.99931
+ ],
+ [
+ -95.80798,
+ 36.999124
+ ],
+ [
+ -95.8193660360989,
+ 36.999150475109
+ ],
+ [
+ -95.866899,
+ 36.999261
+ ],
+ [
+ -95.873882523589,
+ 36.9992996596764
+ ],
+ [
+ -95.873944,
+ 36.9993
+ ],
+ [
+ -95.875257,
+ 36.999302
+ ],
+ [
+ -95.877151,
+ 36.999304
+ ],
+ [
+ -95.91018,
+ 36.999336
+ ],
+ [
+ -95.928122,
+ 36.999245
+ ],
+ [
+ -95.936992,
+ 36.999268
+ ],
+ [
+ -95.9642699335572,
+ 36.9990936072442
+ ],
+ [
+ -96.00081,
+ 36.99886
+ ],
+ [
+ -96.03577206347069,
+ 36.9988881389827
+ ],
+ [
+ -96.0912791627285,
+ 36.9989328134999
+ ],
+ [
+ -96.14121,
+ 36.998973
+ ],
+ [
+ -96.143207,
+ 36.999134
+ ],
+ [
+ -96.147143,
+ 36.999022
+ ],
+ [
+ -96.149709,
+ 36.99904
+ ],
+ [
+ -96.152384,
+ 36.999051
+ ],
+ [
+ -96.154017,
+ 36.999161
+ ],
+ [
+ -96.1847130166869,
+ 36.999210910599096
+ ],
+ [
+ -96.184768,
+ 36.999211
+ ],
+ [
+ -96.200028,
+ 36.999028
+ ],
+ [
+ -96.217571,
+ 36.99907
+ ],
+ [
+ -96.2353201686152,
+ 36.9991306762741
+ ],
+ [
+ -96.2763581402754,
+ 36.9992709662941
+ ],
+ [
+ -96.276368,
+ 36.999271
+ ],
+ [
+ -96.279079,
+ 36.999272
+ ],
+ [
+ -96.2848529997537,
+ 36.999269443646895
+ ],
+ [
+ -96.3452839777254,
+ 36.9992426887236
+ ],
+ [
+ -96.3803000623001,
+ 36.999227185869096
+ ],
+ [
+ -96.381556989653,
+ 36.9992266293831
+ ],
+ [
+ -96.394272,
+ 36.999221
+ ],
+ [
+ -96.415412,
+ 36.999113
+ ],
+ [
+ -96.4157735819161,
+ 36.9991109977438
+ ],
+ [
+ -96.500288,
+ 36.998643
+ ],
+ [
+ -96.5255776738603,
+ 36.9987120358304
+ ],
+ [
+ -96.6073590074175,
+ 36.998935282769395
+ ],
+ [
+ -96.6244880080759,
+ 36.998982041568695
+ ],
+ [
+ -96.705431,
+ 36.999203
+ ],
+ [
+ -96.710482,
+ 36.999271
+ ],
+ [
+ -96.7105846709103,
+ 36.9992710589882
+ ],
+ [
+ -96.7319830041273,
+ 36.999283353112496
+ ],
+ [
+ -96.73659,
+ 36.999286
+ ],
+ [
+ -96.74127,
+ 36.999239
+ ],
+ [
+ -96.749838,
+ 36.998988
+ ],
+ [
+ -96.79206,
+ 36.99918
+ ],
+ [
+ -96.795199,
+ 36.99886
+ ],
+ [
+ -96.822791,
+ 36.999182
+ ],
+ [
+ -96.82290002184439,
+ 36.999182085314196
+ ],
+ [
+ -96.8674690282009,
+ 36.999216962460004
+ ],
+ [
+ -96.867517,
+ 36.999217
+ ],
+ [
+ -96.87629,
+ 36.999233
+ ],
+ [
+ -96.902083,
+ 36.999155
+ ],
+ [
+ -96.90351,
+ 36.999132
+ ],
+ [
+ -96.903748155059,
+ 36.9991328766659
+ ],
+ [
+ -96.917093,
+ 36.999182
+ ],
+ [
+ -96.921915,
+ 36.999151
+ ],
+ [
+ -96.9252940031478,
+ 36.999129494597696
+ ],
+ [
+ -96.934642,
+ 36.99907
+ ],
+ [
+ -96.967371,
+ 36.999067
+ ],
+ [
+ -96.975562,
+ 36.999019
+ ],
+ [
+ -97.030082,
+ 36.998929
+ ],
+ [
+ -97.039784,
+ 36.999
+ ],
+ [
+ -97.0455423673474,
+ 36.998999810791595
+ ],
+ [
+ -97.100652,
+ 36.998998
+ ],
+ [
+ -97.104276,
+ 36.99902
+ ],
+ [
+ -97.1114071565137,
+ 36.99901732731969
+ ],
+ [
+ -97.120285,
+ 36.999014
+ ],
+ [
+ -97.122597,
+ 36.999036
+ ],
+ [
+ -97.147721,
+ 36.999111
+ ],
+ [
+ -97.1562390840263,
+ 36.999101522825995
+ ],
+ [
+ -97.2014651159374,
+ 36.999051204588405
+ ],
+ [
+ -97.2198833931369,
+ 36.999030712513196
+ ],
+ [
+ -97.25577112369089,
+ 36.998990784019
+ ],
+ [
+ -97.30079008310649,
+ 36.9989406961692
+ ],
+ [
+ -97.3427376532895,
+ 36.9988940255304
+ ],
+ [
+ -97.34275707566078,
+ 36.9988940039212
+ ],
+ [
+ -97.3648660500938,
+ 36.998869405596196
+ ],
+ [
+ -97.372421,
+ 36.998861
+ ],
+ [
+ -97.384925,
+ 36.998843
+ ],
+ [
+ -97.46228,
+ 36.998685
+ ],
+ [
+ -97.4623463219255,
+ 36.9986852256487
+ ],
+ [
+ -97.472861,
+ 36.998721
+ ],
+ [
+ -97.47286207314019,
+ 36.9987210005717
+ ],
+ [
+ -97.527292,
+ 36.99875
+ ],
+ [
+ -97.5459,
+ 36.998709
+ ],
+ [
+ -97.546498,
+ 36.998747
+ ],
+ [
+ -97.564536,
+ 36.998711
+ ],
+ [
+ -97.582376688337,
+ 36.998698685241195
+ ],
+ [
+ -97.606549,
+ 36.998682
+ ],
+ [
+ -97.6147895742673,
+ 36.9987919174284
+ ],
+ [
+ -97.6368440053919,
+ 36.9990860918726
+ ],
+ [
+ -97.637137,
+ 36.99909
+ ],
+ [
+ -97.650466,
+ 36.999004
+ ],
+ [
+ -97.69217998394402,
+ 36.9988447931485
+ ],
+ [
+ -97.697104,
+ 36.998826
+ ],
+ [
+ -97.768704,
+ 36.99875
+ ],
+ [
+ -97.783432,
+ 36.998961
+ ],
+ [
+ -97.783489,
+ 36.998847
+ ],
+ [
+ -97.802298,
+ 36.998713
+ ],
+ [
+ -97.8023129924768,
+ 36.998712977542695
+ ],
+ [
+ -97.87645082320878,
+ 36.9986019261725
+ ],
+ [
+ -97.96529191888949,
+ 36.9984688507196
+ ],
+ [
+ -98.0302049855076,
+ 36.9983716171626
+ ],
+ [
+ -98.033955,
+ 36.998366
+ ],
+ [
+ -98.0386869029913,
+ 36.998352446107695
+ ],
+ [
+ -98.03989,
+ 36.998349
+ ],
+ [
+ -98.045342,
+ 36.998327
+ ],
+ [
+ -98.111985,
+ 36.998133
+ ],
+ [
+ -98.12817772200029,
+ 36.9981462401652
+ ],
+ [
+ -98.1463112238645,
+ 36.998161067231294
+ ],
+ [
+ -98.147452,
+ 36.998162
+ ],
+ [
+ -98.177596,
+ 36.998009
+ ],
+ [
+ -98.177722572632,
+ 36.998008950399296
+ ],
+ [
+ -98.1903680175914,
+ 36.998003994964
+ ],
+ [
+ -98.208218,
+ 36.997997
+ ],
+ [
+ -98.219499,
+ 36.997824
+ ],
+ [
+ -98.237712,
+ 36.997972
+ ],
+ [
+ -98.2917921267673,
+ 36.997967014553694
+ ],
+ [
+ -98.346188,
+ 36.997962
+ ],
+ [
+ -98.3471489755077,
+ 36.9979618781261
+ ],
+ [
+ -98.354073,
+ 36.997961
+ ],
+ [
+ -98.408991,
+ 36.998513
+ ],
+ [
+ -98.418268,
+ 36.998538
+ ],
+ [
+ -98.420209,
+ 36.998516
+ ],
+ [
+ -98.47640378040549,
+ 36.998732822067296
+ ],
+ [
+ -98.5446600848551,
+ 36.9989961823461
+ ],
+ [
+ -98.544872,
+ 36.998997
+ ],
+ [
+ -98.6222650058374,
+ 36.9990257418024
+ ],
+ [
+ -98.714512,
+ 36.99906
+ ],
+ [
+ -98.718465,
+ 36.99918
+ ],
+ [
+ -98.761597,
+ 36.999425
+ ],
+ [
+ -98.791936,
+ 36.999255
+ ],
+ [
+ -98.793711,
+ 36.999227
+ ],
+ [
+ -98.797452,
+ 36.999229
+ ],
+ [
+ -98.8118320432389,
+ 36.9992403846753
+ ],
+ [
+ -98.869449,
+ 36.999286
+ ],
+ [
+ -98.880009,
+ 36.999263
+ ],
+ [
+ -98.88058,
+ 36.999309
+ ],
+ [
+ -98.98605030903869,
+ 36.9994795454462
+ ],
+ [
+ -98.994371,
+ 36.999493
+ ],
+ [
+ -99.00030291303248,
+ 36.999510304099104
+ ],
+ [
+ -99.0136679087193,
+ 36.999549291388504
+ ],
+ [
+ -99.029337,
+ 36.999595
+ ],
+ [
+ -99.049695,
+ 36.999221
+ ],
+ [
+ -99.124883,
+ 36.99942
+ ],
+ [
+ -99.129449,
+ 36.999422
+ ],
+ [
+ -99.21543303782309,
+ 36.9995256118126
+ ],
+ [
+ -99.24812,
+ 36.999565
+ ],
+ [
+ -99.277506,
+ 36.999579
+ ],
+ [
+ -99.375391,
+ 37.000177
+ ],
+ [
+ -99.3966738001589,
+ 36.999774548871294
+ ],
+ [
+ -99.407015,
+ 36.999579
+ ],
+ [
+ -99.456203,
+ 36.999471
+ ],
+ [
+ -99.484333,
+ 36.999626
+ ],
+ [
+ -99.500395,
+ 36.999576
+ ],
+ [
+ -99.500395,
+ 36.999637
+ ],
+ [
+ -99.502665,
+ 36.999645
+ ],
+ [
+ -99.504093,
+ 36.999648
+ ],
+ [
+ -99.508574,
+ 36.999658
+ ],
+ [
+ -99.54111590157169,
+ 36.9995725260596
+ ],
+ [
+ -99.558068,
+ 36.999528
+ ],
+ [
+ -99.625399,
+ 36.999671
+ ],
+ [
+ -99.648652,
+ 36.999604
+ ],
+ [
+ -99.657658,
+ 37.000197
+ ],
+ [
+ -99.72258715459529,
+ 37.000553395610005
+ ],
+ [
+ -99.77417240114589,
+ 37.0008365466155
+ ],
+ [
+ -99.774255,
+ 37.000837
+ ],
+ [
+ -99.774816,
+ 37.000841
+ ],
+ [
+ -99.786016,
+ 37.000931
+ ],
+ [
+ -99.8286446159415,
+ 37.00127815953601
+ ],
+ [
+ -99.875409,
+ 37.001659
+ ],
+ [
+ -99.9048971396057,
+ 37.0016521074871
+ ],
+ [
+ -99.995201,
+ 37.001631
+ ],
+ [
+ -100.001286,
+ 37.001699
+ ],
+ [
+ -100.002563,
+ 37.001706
+ ],
+ [
+ -100.005706,
+ 37.001726
+ ],
+ [
+ -100.089483739431,
+ 37.0020915224233
+ ],
+ [
+ -100.115722,
+ 37.002206
+ ],
+ [
+ -100.124494240073,
+ 37.0021908554435
+ ],
+ [
+ -100.187547,
+ 37.002082
+ ],
+ [
+ -100.192371,
+ 37.002036
+ ],
+ [
+ -100.193754,
+ 37.002133
+ ],
+ [
+ -100.201676,
+ 37.002081
+ ],
+ [
+ -100.21607499950301,
+ 37.002020881064105
+ ],
+ [
+ -100.26998661499701,
+ 37.0017957884142
+ ],
+ [
+ -100.434274261089,
+ 37.0011098519743
+ ],
+ [
+ -100.551598,
+ 37.00062
+ ],
+ [
+ -100.552218029947,
+ 37.000685717459795
+ ],
+ [
+ -100.552683,
+ 37.000735
+ ],
+ [
+ -100.591328,
+ 37.000376
+ ],
+ [
+ -100.591413,
+ 37.000399
+ ],
+ [
+ -100.62977,
+ 37.000025
+ ],
+ [
+ -100.633322824093,
+ 36.9999361044857
+ ],
+ [
+ -100.633327,
+ 36.999936
+ ],
+ [
+ -100.67532023955101,
+ 36.999689361198094
+ ],
+ [
+ -100.675552,
+ 36.999688
+ ],
+ [
+ -100.729364903664,
+ 36.9991139591893
+ ],
+ [
+ -100.734517,
+ 36.999059
+ ],
+ [
+ -100.756894,
+ 36.999357
+ ],
+ [
+ -100.759527314039,
+ 36.99930181996189
+ ],
+ [
+ -100.765484,
+ 36.999177
+ ],
+ [
+ -100.806116,
+ 36.999091
+ ],
+ [
+ -100.814277,
+ 36.999085
+ ],
+ [
+ -100.849999795024,
+ 36.9986885311334
+ ],
+ [
+ -100.855634,
+ 36.998626
+ ],
+ [
+ -100.86823987072201,
+ 36.998618301972
+ ],
+ [
+ -100.89166,
+ 36.998604
+ ],
+ [
+ -100.904215897903,
+ 36.998744350531496
+ ],
+ [
+ -100.904274,
+ 36.998745
+ ],
+ [
+ -100.904588,
+ 36.998561
+ ],
+ [
+ -100.945468897552,
+ 36.998152969176196
+ ],
+ [
+ -100.945566,
+ 36.998152
+ ],
+ [
+ -100.958226495697,
+ 36.9981251558517
+ ],
+ [
+ -100.996502,
+ 36.998044
+ ],
+ [
+ -101.012641,
+ 36.998176
+ ],
+ [
+ -101.017729108601,
+ 36.998150030118694
+ ],
+ [
+ -101.053589,
+ 36.997967
+ ],
+ [
+ -101.066451000186,
+ 36.9979220177139
+ ],
+ [
+ -101.066742,
+ 36.997921
+ ],
+ [
+ -101.090050193514,
+ 36.99779265872
+ ],
+ [
+ -101.211486,
+ 36.997124
+ ],
+ [
+ -101.212909,
+ 36.997044
+ ],
+ [
+ -101.214917193591,
+ 36.997033285975
+ ],
+ [
+ -101.283207834316,
+ 36.9966689447923
+ ],
+ [
+ -101.357797,
+ 36.996271
+ ],
+ [
+ -101.359674,
+ 36.996232
+ ],
+ [
+ -101.36112769039401,
+ 36.996226658438005
+ ],
+ [
+ -101.37818,
+ 36.996164
+ ],
+ [
+ -101.39704079598,
+ 36.996081555363894
+ ],
+ [
+ -101.413868,
+ 36.996008
+ ],
+ [
+ -101.415005,
+ 36.995966
+ ],
+ [
+ -101.485326,
+ 36.995611
+ ],
+ [
+ -101.519066,
+ 36.995546
+ ],
+ [
+ -101.555239,
+ 36.995414
+ ],
+ [
+ -101.555260303913,
+ 36.9954138768669
+ ],
+ [
+ -101.595196508927,
+ 36.995183052199394
+ ],
+ [
+ -101.600396,
+ 36.995153
+ ],
+ [
+ -101.601593,
+ 36.995095
+ ],
+ [
+ -101.63250517071101,
+ 36.994951868595
+ ],
+ [
+ -101.70368419581901,
+ 36.994622291161996
+ ],
+ [
+ -101.71825534142101,
+ 36.9945548229612
+ ],
+ [
+ -101.82655213288601,
+ 36.9940533805984
+ ],
+ [
+ -101.862678891166,
+ 36.9938861042942
+ ],
+ [
+ -101.880884426936,
+ 36.9938018079199
+ ],
+ [
+ -101.89897520982501,
+ 36.9937180428813
+ ],
+ [
+ -101.90244,
+ 36.993702
+ ],
+ [
+ -101.90830433588302,
+ 36.993674894342696
+ ],
+ [
+ -101.93521630272801,
+ 36.993550504034005
+ ],
+ [
+ -102.000447,
+ 36.993249
+ ],
+ [
+ -102.000447,
+ 36.993272
+ ],
+ [
+ -102.02820412187499,
+ 36.9931250152408
+ ],
+ [
+ -102.028207,
+ 36.993125
+ ],
+ [
+ -102.042089,
+ 36.993016
+ ],
+ [
+ -102.041952,
+ 37.024742
+ ],
+ [
+ -102.04195,
+ 37.030805
+ ],
+ [
+ -102.041921,
+ 37.032178
+ ],
+ [
+ -102.041749,
+ 37.034397
+ ],
+ [
+ -102.04192,
+ 37.035083
+ ],
+ [
+ -102.041983,
+ 37.106551
+ ],
+ [
+ -102.041809,
+ 37.111973
+ ],
+ [
+ -102.042092,
+ 37.125021
+ ],
+ [
+ -102.042135,
+ 37.125021
+ ],
+ [
+ -102.04212152540701,
+ 37.126715252818194
+ ],
+ [
+ -102.042002,
+ 37.141744
+ ],
+ [
+ -102.041963,
+ 37.258164
+ ],
+ [
+ -102.041664,
+ 37.29765
+ ],
+ [
+ -102.041817,
+ 37.30949
+ ],
+ [
+ -102.041974,
+ 37.352613
+ ],
+ [
+ -102.042089,
+ 37.352819
+ ],
+ [
+ -102.041524,
+ 37.375018
+ ],
+ [
+ -102.041585760593,
+ 37.3891904308032
+ ],
+ [
+ -102.041676,
+ 37.409898
+ ],
+ [
+ -102.041669,
+ 37.43474
+ ],
+ [
+ -102.041755,
+ 37.434855
+ ],
+ [
+ -102.041801,
+ 37.469488
+ ],
+ [
+ -102.041786,
+ 37.506066
+ ],
+ [
+ -102.042016,
+ 37.535261
+ ],
+ [
+ -102.041899,
+ 37.541186
+ ],
+ [
+ -102.041894,
+ 37.557977
+ ],
+ [
+ -102.041618,
+ 37.607868
+ ],
+ [
+ -102.041585,
+ 37.644282
+ ],
+ [
+ -102.041582,
+ 37.654495
+ ],
+ [
+ -102.041694,
+ 37.665681
+ ],
+ [
+ -102.041574,
+ 37.680436
+ ],
+ [
+ -102.041876,
+ 37.723875
+ ],
+ [
+ -102.041989965863,
+ 37.7385406283736
+ ],
+ [
+ -102.042158,
+ 37.760164
+ ],
+ [
+ -102.042668,
+ 37.788758
+ ],
+ [
+ -102.042953,
+ 37.803535
+ ],
+ [
+ -102.043033,
+ 37.824146
+ ],
+ [
+ -102.043219,
+ 37.867929
+ ],
+ [
+ -102.043714529642,
+ 37.9140037576958
+ ],
+ [
+ -102.043845,
+ 37.926135
+ ],
+ [
+ -102.043844,
+ 37.928102
+ ],
+ [
+ -102.044539518897,
+ 38.030195480157396
+ ],
+ [
+ -102.044644,
+ 38.045532
+ ],
+ [
+ -102.044255,
+ 38.113011
+ ],
+ [
+ -102.044589,
+ 38.125013
+ ],
+ [
+ -102.044251,
+ 38.141778
+ ],
+ [
+ -102.044296878805,
+ 38.1755588451927
+ ],
+ [
+ -102.044398,
+ 38.250015
+ ],
+ [
+ -102.04451007292,
+ 38.2624115834718
+ ],
+ [
+ -102.044567368215,
+ 38.2687491172007
+ ],
+ [
+ -102.044568,
+ 38.268819
+ ],
+ [
+ -102.044613,
+ 38.312324
+ ],
+ [
+ -102.044944,
+ 38.384419
+ ],
+ [
+ -102.044442,
+ 38.415802
+ ],
+ [
+ -102.044936,
+ 38.41968
+ ],
+ [
+ -102.045324,
+ 38.453647
+ ],
+ [
+ -102.045263,
+ 38.505395
+ ],
+ [
+ -102.045262,
+ 38.505532
+ ],
+ [
+ -102.045112,
+ 38.523784
+ ],
+ [
+ -102.045223,
+ 38.543797
+ ],
+ [
+ -102.045189,
+ 38.558732
+ ],
+ [
+ -102.045211,
+ 38.581609
+ ],
+ [
+ -102.045287815606,
+ 38.6151684415595
+ ],
+ [
+ -102.045288,
+ 38.615249
+ ],
+ [
+ -102.045074,
+ 38.669617
+ ],
+ [
+ -102.045102,
+ 38.674946
+ ],
+ [
+ -102.04516,
+ 38.675221
+ ],
+ [
+ -102.045127,
+ 38.686725
+ ],
+ [
+ -102.045156,
+ 38.688555
+ ],
+ [
+ -102.045212,
+ 38.697567
+ ],
+ [
+ -102.045375,
+ 38.754339
+ ],
+ [
+ -102.045287,
+ 38.755528
+ ],
+ [
+ -102.045371,
+ 38.770064
+ ],
+ [
+ -102.045448,
+ 38.783453
+ ],
+ [
+ -102.045334,
+ 38.799463
+ ],
+ [
+ -102.045388,
+ 38.813392
+ ],
+ [
+ -102.046571,
+ 39.047038
+ ],
+ [
+ -102.046765712414,
+ 39.075626831689
+ ],
+ [
+ -102.047134,
+ 39.129701
+ ],
+ [
+ -102.047188609269,
+ 39.13314656241629
+ ],
+ [
+ -102.04725,
+ 39.13702
+ ],
+ [
+ -102.047851017737,
+ 39.2202892780959
+ ],
+ [
+ -102.048449,
+ 39.303138
+ ],
+ [
+ -102.04896,
+ 39.373712
+ ],
+ [
+ -102.04910095993701,
+ 39.3940626653531
+ ],
+ [
+ -102.049167,
+ 39.403597
+ ],
+ [
+ -102.04937,
+ 39.41821
+ ],
+ [
+ -102.049369,
+ 39.423333
+ ],
+ [
+ -102.049679,
+ 39.506183
+ ],
+ [
+ -102.049673,
+ 39.536691
+ ],
+ [
+ -102.049554,
+ 39.538932
+ ],
+ [
+ -102.049763830217,
+ 39.568180000858
+ ],
+ [
+ -102.049806,
+ 39.574058
+ ],
+ [
+ -102.049954,
+ 39.592331
+ ],
+ [
+ -102.050422,
+ 39.646048
+ ],
+ [
+ -102.050099,
+ 39.653812
+ ],
+ [
+ -102.050594,
+ 39.675594
+ ],
+ [
+ -102.05089868975001,
+ 39.741793849543
+ ],
+ [
+ -102.051254,
+ 39.818992
+ ],
+ [
+ -102.051318,
+ 39.833311
+ ],
+ [
+ -102.051363,
+ 39.843471
+ ],
+ [
+ -102.051569,
+ 39.849805
+ ],
+ [
+ -102.05158004898101,
+ 39.8594822026556
+ ],
+ [
+ -102.05171567539001,
+ 39.9782700117882
+ ],
+ [
+ -102.051744,
+ 40.003078
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/manhattan_ks_geojson.json b/tests/data/manhattan_ks_geojson.json
new file mode 100644
index 00000000..d79d6b71
--- /dev/null
+++ b/tests/data/manhattan_ks_geojson.json
@@ -0,0 +1,1214 @@
+{
+ "type": "MultiPolygon",
+ "coordinates": [
+ [
+ [
+ [
+ -96.527134,
+ 39.196235
+ ],
+ [
+ -96.523523,
+ 39.197182
+ ],
+ [
+ -96.520176,
+ 39.197504
+ ],
+ [
+ -96.521925,
+ 39.195924
+ ],
+ [
+ -96.521829,
+ 39.192578
+ ],
+ [
+ -96.527132,
+ 39.192163
+ ],
+ [
+ -96.527137,
+ 39.194284
+ ],
+ [
+ -96.527134,
+ 39.196235
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -96.593296,
+ 39.144707
+ ],
+ [
+ -96.59093,
+ 39.144713
+ ],
+ [
+ -96.589786,
+ 39.143112
+ ],
+ [
+ -96.590953,
+ 39.142014
+ ],
+ [
+ -96.593326,
+ 39.142013
+ ],
+ [
+ -96.593296,
+ 39.144707
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -96.614425,
+ 39.158569
+ ],
+ [
+ -96.612409,
+ 39.159704
+ ],
+ [
+ -96.612173,
+ 39.159793
+ ],
+ [
+ -96.61212,
+ 39.157956
+ ],
+ [
+ -96.614411,
+ 39.157964
+ ],
+ [
+ -96.614425,
+ 39.158569
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -96.653928,
+ 39.208543
+ ],
+ [
+ -96.653875,
+ 39.214271
+ ],
+ [
+ -96.653129,
+ 39.214263
+ ],
+ [
+ -96.648796,
+ 39.21824
+ ],
+ [
+ -96.644752,
+ 39.218271
+ ],
+ [
+ -96.644619,
+ 39.218274
+ ],
+ [
+ -96.643888,
+ 39.219594
+ ],
+ [
+ -96.642218,
+ 39.220731
+ ],
+ [
+ -96.641888,
+ 39.221226
+ ],
+ [
+ -96.641551,
+ 39.221142
+ ],
+ [
+ -96.64015,
+ 39.221218
+ ],
+ [
+ -96.635958,
+ 39.21978
+ ],
+ [
+ -96.635444,
+ 39.218921
+ ],
+ [
+ -96.635418,
+ 39.218341
+ ],
+ [
+ -96.623818,
+ 39.218416
+ ],
+ [
+ -96.624562,
+ 39.215222
+ ],
+ [
+ -96.622789,
+ 39.215971
+ ],
+ [
+ -96.622838,
+ 39.218352
+ ],
+ [
+ -96.618519,
+ 39.218389
+ ],
+ [
+ -96.618519,
+ 39.219307
+ ],
+ [
+ -96.618523,
+ 39.221809
+ ],
+ [
+ -96.61778,
+ 39.221725
+ ],
+ [
+ -96.617306,
+ 39.221993
+ ],
+ [
+ -96.616764,
+ 39.218978
+ ],
+ [
+ -96.613974,
+ 39.218633
+ ],
+ [
+ -96.613912,
+ 39.220735
+ ],
+ [
+ -96.614882,
+ 39.219816
+ ],
+ [
+ -96.616751,
+ 39.220707
+ ],
+ [
+ -96.616712,
+ 39.222851
+ ],
+ [
+ -96.61142,
+ 39.223989
+ ],
+ [
+ -96.611,
+ 39.222778
+ ],
+ [
+ -96.610918,
+ 39.218639
+ ],
+ [
+ -96.607347,
+ 39.218493
+ ],
+ [
+ -96.607358,
+ 39.218202
+ ],
+ [
+ -96.607359,
+ 39.214574
+ ],
+ [
+ -96.602743,
+ 39.214689
+ ],
+ [
+ -96.602806,
+ 39.211064
+ ],
+ [
+ -96.598135,
+ 39.211099
+ ],
+ [
+ -96.576705,
+ 39.211477
+ ],
+ [
+ -96.576207,
+ 39.212843
+ ],
+ [
+ -96.57567,
+ 39.213021
+ ],
+ [
+ -96.577161,
+ 39.216325
+ ],
+ [
+ -96.572884,
+ 39.216274
+ ],
+ [
+ -96.57434,
+ 39.218567
+ ],
+ [
+ -96.577676,
+ 39.218611
+ ],
+ [
+ -96.578533,
+ 39.219116
+ ],
+ [
+ -96.583214,
+ 39.227755
+ ],
+ [
+ -96.581081,
+ 39.227735
+ ],
+ [
+ -96.581067,
+ 39.225884
+ ],
+ [
+ -96.576781,
+ 39.225847
+ ],
+ [
+ -96.576806,
+ 39.228795
+ ],
+ [
+ -96.571713,
+ 39.22184
+ ],
+ [
+ -96.567096,
+ 39.223918
+ ],
+ [
+ -96.56699,
+ 39.218782
+ ],
+ [
+ -96.564173,
+ 39.218747
+ ],
+ [
+ -96.564795,
+ 39.220477
+ ],
+ [
+ -96.564818,
+ 39.224902
+ ],
+ [
+ -96.562994,
+ 39.225741
+ ],
+ [
+ -96.562977,
+ 39.22333
+ ],
+ [
+ -96.560634,
+ 39.221528
+ ],
+ [
+ -96.56059,
+ 39.218721
+ ],
+ [
+ -96.557665,
+ 39.2186
+ ],
+ [
+ -96.557665,
+ 39.21852
+ ],
+ [
+ -96.5576,
+ 39.215429
+ ],
+ [
+ -96.557507,
+ 39.211061
+ ],
+ [
+ -96.554002,
+ 39.211069
+ ],
+ [
+ -96.551305,
+ 39.209561
+ ],
+ [
+ -96.549329,
+ 39.211349
+ ],
+ [
+ -96.547125,
+ 39.208352
+ ],
+ [
+ -96.545034,
+ 39.208359
+ ],
+ [
+ -96.544941,
+ 39.204119
+ ],
+ [
+ -96.5537,
+ 39.204097
+ ],
+ [
+ -96.553729,
+ 39.20183
+ ],
+ [
+ -96.550093,
+ 39.201843
+ ],
+ [
+ -96.550066,
+ 39.199065
+ ],
+ [
+ -96.557338,
+ 39.199034
+ ],
+ [
+ -96.556629,
+ 39.198491
+ ],
+ [
+ -96.554906,
+ 39.196098
+ ],
+ [
+ -96.552616,
+ 39.195842
+ ],
+ [
+ -96.552602,
+ 39.195168
+ ],
+ [
+ -96.547917,
+ 39.19648
+ ],
+ [
+ -96.545603,
+ 39.196771
+ ],
+ [
+ -96.541478,
+ 39.195846
+ ],
+ [
+ -96.540195,
+ 39.194494
+ ],
+ [
+ -96.539546,
+ 39.192329
+ ],
+ [
+ -96.544479,
+ 39.189636
+ ],
+ [
+ -96.544494,
+ 39.18861
+ ],
+ [
+ -96.547892,
+ 39.185367
+ ],
+ [
+ -96.548013,
+ 39.182437
+ ],
+ [
+ -96.551898,
+ 39.181145
+ ],
+ [
+ -96.55409,
+ 39.178605
+ ],
+ [
+ -96.555153,
+ 39.174347
+ ],
+ [
+ -96.556014,
+ 39.171419
+ ],
+ [
+ -96.56156,
+ 39.171463
+ ],
+ [
+ -96.562768,
+ 39.171018
+ ],
+ [
+ -96.569974,
+ 39.171039
+ ],
+ [
+ -96.57409,
+ 39.171614
+ ],
+ [
+ -96.576602,
+ 39.172767
+ ],
+ [
+ -96.586871,
+ 39.172453
+ ],
+ [
+ -96.590917,
+ 39.172011
+ ],
+ [
+ -96.590662,
+ 39.171012
+ ],
+ [
+ -96.593292,
+ 39.16957
+ ],
+ [
+ -96.59351,
+ 39.168318
+ ],
+ [
+ -96.593129,
+ 39.167934
+ ],
+ [
+ -96.593656,
+ 39.167408
+ ],
+ [
+ -96.592761,
+ 39.167407
+ ],
+ [
+ -96.593931,
+ 39.165958
+ ],
+ [
+ -96.595124,
+ 39.165972
+ ],
+ [
+ -96.595127,
+ 39.165814
+ ],
+ [
+ -96.595579,
+ 39.165539
+ ],
+ [
+ -96.597541,
+ 39.165531
+ ],
+ [
+ -96.598221,
+ 39.166318
+ ],
+ [
+ -96.598909,
+ 39.164458
+ ],
+ [
+ -96.596782,
+ 39.162996
+ ],
+ [
+ -96.595662,
+ 39.163684
+ ],
+ [
+ -96.595783,
+ 39.16129
+ ],
+ [
+ -96.596747,
+ 39.15761
+ ],
+ [
+ -96.597992,
+ 39.157618
+ ],
+ [
+ -96.597987,
+ 39.160125
+ ],
+ [
+ -96.613044,
+ 39.160211
+ ],
+ [
+ -96.614063,
+ 39.160877
+ ],
+ [
+ -96.612102,
+ 39.161845
+ ],
+ [
+ -96.613036,
+ 39.163657
+ ],
+ [
+ -96.616702,
+ 39.163216
+ ],
+ [
+ -96.616403,
+ 39.166676
+ ],
+ [
+ -96.617439,
+ 39.167255
+ ],
+ [
+ -96.620826,
+ 39.167267
+ ],
+ [
+ -96.620883,
+ 39.164348
+ ],
+ [
+ -96.619342,
+ 39.162664
+ ],
+ [
+ -96.621292,
+ 39.160246
+ ],
+ [
+ -96.623241,
+ 39.159242
+ ],
+ [
+ -96.626818,
+ 39.161565
+ ],
+ [
+ -96.632011,
+ 39.163846
+ ],
+ [
+ -96.635459,
+ 39.164946
+ ],
+ [
+ -96.635412,
+ 39.160248
+ ],
+ [
+ -96.643427,
+ 39.160303
+ ],
+ [
+ -96.642399,
+ 39.161956
+ ],
+ [
+ -96.642365,
+ 39.167436
+ ],
+ [
+ -96.635473,
+ 39.167397
+ ],
+ [
+ -96.634072,
+ 39.169281
+ ],
+ [
+ -96.636392,
+ 39.172636
+ ],
+ [
+ -96.636159,
+ 39.17436
+ ],
+ [
+ -96.637033,
+ 39.174623
+ ],
+ [
+ -96.626101,
+ 39.174497
+ ],
+ [
+ -96.626066,
+ 39.181823
+ ],
+ [
+ -96.62139,
+ 39.181818
+ ],
+ [
+ -96.618135,
+ 39.184335
+ ],
+ [
+ -96.616708,
+ 39.184322
+ ],
+ [
+ -96.616679,
+ 39.187691
+ ],
+ [
+ -96.619344,
+ 39.18783
+ ],
+ [
+ -96.620655,
+ 39.186379
+ ],
+ [
+ -96.619057,
+ 39.185507
+ ],
+ [
+ -96.623136,
+ 39.18599
+ ],
+ [
+ -96.626022,
+ 39.188929
+ ],
+ [
+ -96.628026,
+ 39.188815
+ ],
+ [
+ -96.628941,
+ 39.188093
+ ],
+ [
+ -96.628908,
+ 39.18188
+ ],
+ [
+ -96.640019,
+ 39.181931
+ ],
+ [
+ -96.640157,
+ 39.174662
+ ],
+ [
+ -96.644693,
+ 39.174714
+ ],
+ [
+ -96.646551,
+ 39.174677
+ ],
+ [
+ -96.645413,
+ 39.172693
+ ],
+ [
+ -96.64678,
+ 39.174676
+ ],
+ [
+ -96.647005,
+ 39.174676
+ ],
+ [
+ -96.647886,
+ 39.177458
+ ],
+ [
+ -96.645559,
+ 39.181748
+ ],
+ [
+ -96.64941,
+ 39.181892
+ ],
+ [
+ -96.649415,
+ 39.188721
+ ],
+ [
+ -96.648776,
+ 39.188998
+ ],
+ [
+ -96.644774,
+ 39.188293
+ ],
+ [
+ -96.644778,
+ 39.18746
+ ],
+ [
+ -96.642932,
+ 39.188171
+ ],
+ [
+ -96.642779,
+ 39.188256
+ ],
+ [
+ -96.64287,
+ 39.1888
+ ],
+ [
+ -96.642242,
+ 39.192155
+ ],
+ [
+ -96.644757,
+ 39.194128
+ ],
+ [
+ -96.644757,
+ 39.194397
+ ],
+ [
+ -96.644771,
+ 39.195431
+ ],
+ [
+ -96.644779,
+ 39.196571
+ ],
+ [
+ -96.644801,
+ 39.20006
+ ],
+ [
+ -96.642591,
+ 39.200026
+ ],
+ [
+ -96.64161,
+ 39.202378
+ ],
+ [
+ -96.642106,
+ 39.202365
+ ],
+ [
+ -96.642903,
+ 39.202508
+ ],
+ [
+ -96.643791,
+ 39.203199
+ ],
+ [
+ -96.644823,
+ 39.203199
+ ],
+ [
+ -96.644827,
+ 39.203603
+ ],
+ [
+ -96.653971,
+ 39.203925
+ ],
+ [
+ -96.653928,
+ 39.208543
+ ]
+ ],
+ [
+ [
+ -96.650258,
+ 39.212194
+ ],
+ [
+ -96.650345,
+ 39.210343
+ ],
+ [
+ -96.648449,
+ 39.210061
+ ],
+ [
+ -96.646044,
+ 39.214679
+ ],
+ [
+ -96.645444,
+ 39.217244
+ ],
+ [
+ -96.648013,
+ 39.217662
+ ],
+ [
+ -96.653723,
+ 39.212142
+ ],
+ [
+ -96.650258,
+ 39.212194
+ ]
+ ],
+ [
+ [
+ -96.648045,
+ 39.209789
+ ],
+ [
+ -96.64692,
+ 39.208327
+ ],
+ [
+ -96.64532,
+ 39.209226
+ ],
+ [
+ -96.646702,
+ 39.210475
+ ],
+ [
+ -96.647153,
+ 39.211836
+ ],
+ [
+ -96.648045,
+ 39.209789
+ ]
+ ],
+ [
+ [
+ -96.644808,
+ 39.206858
+ ],
+ [
+ -96.64415,
+ 39.205931
+ ],
+ [
+ -96.643031,
+ 39.206496
+ ],
+ [
+ -96.643031,
+ 39.20757
+ ],
+ [
+ -96.643389,
+ 39.207837
+ ],
+ [
+ -96.644807,
+ 39.20754
+ ],
+ [
+ -96.644808,
+ 39.206858
+ ]
+ ],
+ [
+ [
+ -96.642115,
+ 39.188576
+ ],
+ [
+ -96.640398,
+ 39.188806
+ ],
+ [
+ -96.639742,
+ 39.187972
+ ],
+ [
+ -96.639583,
+ 39.187043
+ ],
+ [
+ -96.638185,
+ 39.186814
+ ],
+ [
+ -96.63787,
+ 39.189021
+ ],
+ [
+ -96.639956,
+ 39.189067
+ ],
+ [
+ -96.641244,
+ 39.189654
+ ],
+ [
+ -96.642054,
+ 39.189497
+ ],
+ [
+ -96.642115,
+ 39.188576
+ ]
+ ],
+ [
+ [
+ -96.624631,
+ 39.171643
+ ],
+ [
+ -96.621887,
+ 39.170234
+ ],
+ [
+ -96.620944,
+ 39.172818
+ ],
+ [
+ -96.621113,
+ 39.173699
+ ],
+ [
+ -96.624101,
+ 39.173763
+ ],
+ [
+ -96.624631,
+ 39.171643
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -96.65652,
+ 39.155191
+ ],
+ [
+ -96.654334,
+ 39.156494
+ ],
+ [
+ -96.653522,
+ 39.155412
+ ],
+ [
+ -96.649351,
+ 39.154282
+ ],
+ [
+ -96.649357,
+ 39.152981
+ ],
+ [
+ -96.649388,
+ 39.148885
+ ],
+ [
+ -96.652343,
+ 39.147664
+ ],
+ [
+ -96.653748,
+ 39.148451
+ ],
+ [
+ -96.653974,
+ 39.153007
+ ],
+ [
+ -96.655805,
+ 39.153025
+ ],
+ [
+ -96.656541,
+ 39.153712
+ ],
+ [
+ -96.65652,
+ 39.155191
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -96.690275,
+ 39.131383
+ ],
+ [
+ -96.687251,
+ 39.131461
+ ],
+ [
+ -96.686853,
+ 39.131457
+ ],
+ [
+ -96.687749,
+ 39.132022
+ ],
+ [
+ -96.687738,
+ 39.13605
+ ],
+ [
+ -96.685674,
+ 39.137612
+ ],
+ [
+ -96.68387,
+ 39.140613
+ ],
+ [
+ -96.682428,
+ 39.140605
+ ],
+ [
+ -96.681893,
+ 39.149461
+ ],
+ [
+ -96.6726,
+ 39.149481
+ ],
+ [
+ -96.672606,
+ 39.147312
+ ],
+ [
+ -96.671102,
+ 39.145935
+ ],
+ [
+ -96.668186,
+ 39.14596
+ ],
+ [
+ -96.663327,
+ 39.150481
+ ],
+ [
+ -96.663349,
+ 39.152178
+ ],
+ [
+ -96.658225,
+ 39.152177
+ ],
+ [
+ -96.659146,
+ 39.149977
+ ],
+ [
+ -96.657431,
+ 39.149375
+ ],
+ [
+ -96.66211,
+ 39.14528
+ ],
+ [
+ -96.662102,
+ 39.144074
+ ],
+ [
+ -96.664567,
+ 39.143697
+ ],
+ [
+ -96.664567,
+ 39.14203
+ ],
+ [
+ -96.663246,
+ 39.142013
+ ],
+ [
+ -96.663239,
+ 39.140734
+ ],
+ [
+ -96.661239,
+ 39.139812
+ ],
+ [
+ -96.663498,
+ 39.137969
+ ],
+ [
+ -96.6822,
+ 39.126607
+ ],
+ [
+ -96.690043,
+ 39.124135
+ ],
+ [
+ -96.690275,
+ 39.131383
+ ]
+ ],
+ [
+ [
+ -96.681838,
+ 39.134905
+ ],
+ [
+ -96.680044,
+ 39.134939
+ ],
+ [
+ -96.676362,
+ 39.138369
+ ],
+ [
+ -96.676096,
+ 39.138605
+ ],
+ [
+ -96.681916,
+ 39.138585
+ ],
+ [
+ -96.681838,
+ 39.134905
+ ]
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/new_mexico_state_geojson.json b/tests/data/new_mexico_state_geojson.json
new file mode 100644
index 00000000..1272a7c4
--- /dev/null
+++ b/tests/data/new_mexico_state_geojson.json
@@ -0,0 +1,76 @@
+{
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ -107.421329,
+ 37.000263
+ ],
+ [
+ -106.868158,
+ 36.994786
+ ],
+ [
+ -104.337812,
+ 36.994786
+ ],
+ [
+ -103.001438,
+ 37.000263
+ ],
+ [
+ -103.001438,
+ 36.501861
+ ],
+ [
+ -103.039777,
+ 36.501861
+ ],
+ [
+ -103.045254,
+ 34.01533
+ ],
+ [
+ -103.067161,
+ 33.002096
+ ],
+ [
+ -103.067161,
+ 31.999816
+ ],
+ [
+ -106.616219,
+ 31.999816
+ ],
+ [
+ -106.643603,
+ 31.901231
+ ],
+ [
+ -106.528588,
+ 31.786216
+ ],
+ [
+ -108.210008,
+ 31.786216
+ ],
+ [
+ -108.210008,
+ 31.331629
+ ],
+ [
+ -109.04798,
+ 31.331629
+ ],
+ [
+ -109.042503,
+ 37.000263
+ ],
+ [
+ -107.421329,
+ 37.000263
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/ny_city_geojson.json b/tests/data/ny_city_geojson.json
new file mode 100644
index 00000000..df4735f7
--- /dev/null
+++ b/tests/data/ny_city_geojson.json
@@ -0,0 +1,2982 @@
+{
+ "type": "MultiPolygon",
+ "coordinates": [
+ [
+ [
+ [
+ -73.773361,
+ 40.859449
+ ],
+ [
+ -73.7724428951654,
+ 40.859736949576096
+ ],
+ [
+ -73.770552,
+ 40.86033
+ ],
+ [
+ -73.768867,
+ 40.858341
+ ],
+ [
+ -73.765258,
+ 40.855361
+ ],
+ [
+ -73.7662834427055,
+ 40.8547972826635
+ ],
+ [
+ -73.768043,
+ 40.85383
+ ],
+ [
+ -73.76873030709459,
+ 40.85098201195859
+ ],
+ [
+ -73.769236584406,
+ 40.848884155353396
+ ],
+ [
+ -73.769414,
+ 40.848149
+ ],
+ [
+ -73.767179,
+ 40.844866
+ ],
+ [
+ -73.769648,
+ 40.84466
+ ],
+ [
+ -73.7719699256149,
+ 40.847033504858494
+ ],
+ [
+ -73.772349,
+ 40.847421
+ ],
+ [
+ -73.773434,
+ 40.852032
+ ],
+ [
+ -73.773361,
+ 40.859449
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.027106,
+ 40.685092
+ ],
+ [
+ -74.025442,
+ 40.687976
+ ],
+ [
+ -74.0195,
+ 40.693382
+ ],
+ [
+ -74.01546,
+ 40.693382
+ ],
+ [
+ -74.0149598341925,
+ 40.692975765571596
+ ],
+ [
+ -74.012132,
+ 40.690679
+ ],
+ [
+ -74.013083,
+ 40.687795
+ ],
+ [
+ -74.016173,
+ 40.687075
+ ],
+ [
+ -74.019976,
+ 40.685813
+ ],
+ [
+ -74.025442,
+ 40.684191
+ ],
+ [
+ -74.02602912632729,
+ 40.6845089091472
+ ],
+ [
+ -74.027106,
+ 40.685092
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.0420116265256,
+ 40.626048022196
+ ],
+ [
+ -74.0419869662144,
+ 40.626121997079395
+ ],
+ [
+ -74.0419861639864,
+ 40.6261244035665
+ ],
+ [
+ -74.0415843352794,
+ 40.6273297911037
+ ],
+ [
+ -74.0412160016512,
+ 40.6284347016219
+ ],
+ [
+ -74.0410427721954,
+ 40.6289543474893
+ ],
+ [
+ -74.0402915086622,
+ 40.631207953775196
+ ],
+ [
+ -74.0395755857775,
+ 40.6333555467857
+ ],
+ [
+ -74.03942056116,
+ 40.6338205826048
+ ],
+ [
+ -74.0393851747986,
+ 40.63392673300719
+ ],
+ [
+ -74.0387807086057,
+ 40.6357399832871
+ ],
+ [
+ -74.03870402208149,
+ 40.6359700240455
+ ],
+ [
+ -74.038336,
+ 40.637074
+ ],
+ [
+ -74.0374076923077,
+ 40.6384664615385
+ ],
+ [
+ -74.03585910791371,
+ 40.6407893381295
+ ],
+ [
+ -74.03351683155289,
+ 40.6443027526705
+ ],
+ [
+ -74.032066,
+ 40.646479
+ ],
+ [
+ -74.02620732724439,
+ 40.6518050661414
+ ],
+ [
+ -74.018272,
+ 40.659019
+ ],
+ [
+ -74.0186609605392,
+ 40.6625189360408
+ ],
+ [
+ -74.020467,
+ 40.67877
+ ],
+ [
+ -74.0194315835348,
+ 40.679441264418294
+ ],
+ [
+ -74.0152711331479,
+ 40.68213850017109
+ ],
+ [
+ -74.01514529702558,
+ 40.6822200802061
+ ],
+ [
+ -74.012113182521,
+ 40.6841858115303
+ ],
+ [
+ -74.0082201392615,
+ 40.6867096862291
+ ],
+ [
+ -74.007379,
+ 40.687255
+ ],
+ [
+ -74.0073752505717,
+ 40.6872620398502
+ ],
+ [
+ -74.0065840928067,
+ 40.6887475015646
+ ],
+ [
+ -74.0061396893279,
+ 40.6895819044898
+ ],
+ [
+ -74.00550752815289,
+ 40.6907688374433
+ ],
+ [
+ -74.0053513232339,
+ 40.69106212461929
+ ],
+ [
+ -74.0030179672998,
+ 40.695443186222
+ ],
+ [
+ -74.002388,
+ 40.696626
+ ],
+ [
+ -74.0018828543745,
+ 40.697315156889395
+ ],
+ [
+ -74.00074098410501,
+ 40.698872980462404
+ ],
+ [
+ -73.998822,
+ 40.701491
+ ],
+ [
+ -74.0016558967292,
+ 40.7026627125126
+ ],
+ [
+ -74.0037653576436,
+ 40.7035348973466
+ ],
+ [
+ -74.004051,
+ 40.703653
+ ],
+ [
+ -74.0067847421372,
+ 40.701975625768
+ ],
+ [
+ -74.0072294160965,
+ 40.701702781950395
+ ],
+ [
+ -74.009043,
+ 40.70059
+ ],
+ [
+ -74.00988980027171,
+ 40.700493792942005
+ ],
+ [
+ -74.0135324921432,
+ 40.700079937774596
+ ],
+ [
+ -74.013796,
+ 40.70005
+ ],
+ [
+ -74.0142519151327,
+ 40.7003146857495
+ ],
+ [
+ -74.0168,
+ 40.701794
+ ],
+ [
+ -74.01798561601879,
+ 40.7040517156102
+ ],
+ [
+ -74.018073039368,
+ 40.7042181919879
+ ],
+ [
+ -74.0194854329352,
+ 40.70690774995101
+ ],
+ [
+ -74.019526,
+ 40.706985
+ ],
+ [
+ -74.024543,
+ 40.709436
+ ],
+ [
+ -74.02385865547001,
+ 40.7130277101558
+ ],
+ [
+ -74.0233371654942,
+ 40.7157646953441
+ ],
+ [
+ -74.0224656208889,
+ 40.7203389053696
+ ],
+ [
+ -74.0218509332832,
+ 40.7235650284983
+ ],
+ [
+ -74.02153686156879,
+ 40.725213400797195
+ ],
+ [
+ -74.0214927100048,
+ 40.725445125628504
+ ],
+ [
+ -74.021117,
+ 40.727417
+ ],
+ [
+ -74.0210755680795,
+ 40.7275818914723
+ ],
+ [
+ -74.02071541526209,
+ 40.7290152338731
+ ],
+ [
+ -74.0203883683071,
+ 40.730316820990794
+ ],
+ [
+ -74.01977669977019,
+ 40.732751149994
+ ],
+ [
+ -74.01887121687479,
+ 40.7363548064537
+ ],
+ [
+ -74.017789810843,
+ 40.740658604849
+ ],
+ [
+ -74.01692332756079,
+ 40.7441070499749
+ ],
+ [
+ -74.0156108717903,
+ 40.7493303841091
+ ],
+ [
+ -74.013784,
+ 40.756601
+ ],
+ [
+ -74.0098517287783,
+ 40.762584890989594
+ ],
+ [
+ -74.009184,
+ 40.763601
+ ],
+ [
+ -74.00828125206719,
+ 40.7648550996597
+ ],
+ [
+ -74.0043787184341,
+ 40.77027650902949
+ ],
+ [
+ -74.00139463374009,
+ 40.7744220068627
+ ],
+ [
+ -74.00022288810109,
+ 40.7760497988009
+ ],
+ [
+ -73.9976083602156,
+ 40.7796819074023
+ ],
+ [
+ -73.99723790003179,
+ 40.78019655160529
+ ],
+ [
+ -73.9955868235623,
+ 40.782490231118096
+ ],
+ [
+ -73.9946736174299,
+ 40.7837588593345
+ ],
+ [
+ -73.9928571064622,
+ 40.7862823608611
+ ],
+ [
+ -73.9915676124392,
+ 40.788073729145395
+ ],
+ [
+ -73.9912420918403,
+ 40.788525943166
+ ],
+ [
+ -73.989894390288,
+ 40.7903981734938
+ ],
+ [
+ -73.9880545412037,
+ 40.79295409638969
+ ],
+ [
+ -73.9861819941365,
+ 40.7955554434041
+ ],
+ [
+ -73.98482221536119,
+ 40.7974444514401
+ ],
+ [
+ -73.9843088955015,
+ 40.7981575566581
+ ],
+ [
+ -73.9824834097892,
+ 40.800693525922
+ ],
+ [
+ -73.9806163897831,
+ 40.8032871947296
+ ],
+ [
+ -73.97885474255939,
+ 40.8057344794073
+ ],
+ [
+ -73.9771693704015,
+ 40.808075802575196
+ ],
+ [
+ -73.9750969903285,
+ 40.81095475809529
+ ],
+ [
+ -73.97122753768102,
+ 40.81633021127801
+ ],
+ [
+ -73.968082,
+ 40.8207
+ ],
+ [
+ -73.967982575439,
+ 40.8208258025057
+ ],
+ [
+ -73.9659860397118,
+ 40.8233520313851
+ ],
+ [
+ -73.9657062398566,
+ 40.8237060638549
+ ],
+ [
+ -73.9650921290633,
+ 40.8244831020016
+ ],
+ [
+ -73.9636574765412,
+ 40.8262983766213
+ ],
+ [
+ -73.963182,
+ 40.8269
+ ],
+ [
+ -73.96234990397281,
+ 40.8288083941493
+ ],
+ [
+ -73.9614512106068,
+ 40.8308695278475
+ ],
+ [
+ -73.9599182216476,
+ 40.834385404699496
+ ],
+ [
+ -73.95861143270739,
+ 40.837382496725496
+ ],
+ [
+ -73.9576235765217,
+ 40.839648123412296
+ ],
+ [
+ -73.9555356566198,
+ 40.844436722317596
+ ],
+ [
+ -73.953982,
+ 40.848
+ ],
+ [
+ -73.9521001021992,
+ 40.851432705706095
+ ],
+ [
+ -73.952095189942,
+ 40.8514416659872
+ ],
+ [
+ -73.948281,
+ 40.858399
+ ],
+ [
+ -73.94827788810748,
+ 40.8584039729262
+ ],
+ [
+ -73.94572611766459,
+ 40.862481802163394
+ ],
+ [
+ -73.9381535187682,
+ 40.8745831121645
+ ],
+ [
+ -73.938081,
+ 40.874699
+ ],
+ [
+ -73.9334079229381,
+ 40.882074964842694
+ ],
+ [
+ -73.933406,
+ 40.882078
+ ],
+ [
+ -73.9290088898939,
+ 40.8895730740445
+ ],
+ [
+ -73.929006,
+ 40.889578
+ ],
+ [
+ -73.926757656973,
+ 40.895355378598595
+ ],
+ [
+ -73.919705,
+ 40.913478
+ ],
+ [
+ -73.9196864010756,
+ 40.9135352131528
+ ],
+ [
+ -73.91925644253189,
+ 40.9148578317808
+ ],
+ [
+ -73.918405,
+ 40.917477
+ ],
+ [
+ -73.917905,
+ 40.917577
+ ],
+ [
+ -73.910516,
+ 40.915282
+ ],
+ [
+ -73.902454,
+ 40.912979
+ ],
+ [
+ -73.900697,
+ 40.912381
+ ],
+ [
+ -73.899505,
+ 40.911978
+ ],
+ [
+ -73.897253,
+ 40.911655
+ ],
+ [
+ -73.896634,
+ 40.911324
+ ],
+ [
+ -73.891928,
+ 40.909809
+ ],
+ [
+ -73.886237,
+ 40.908052
+ ],
+ [
+ -73.885401,
+ 40.907977
+ ],
+ [
+ -73.882993,
+ 40.907423
+ ],
+ [
+ -73.880929,
+ 40.90683
+ ],
+ [
+ -73.87835,
+ 40.905983
+ ],
+ [
+ -73.878189,
+ 40.905983
+ ],
+ [
+ -73.877855,
+ 40.905922
+ ],
+ [
+ -73.872913,
+ 40.904467
+ ],
+ [
+ -73.867876,
+ 40.902983
+ ],
+ [
+ -73.865635,
+ 40.902086
+ ],
+ [
+ -73.864669,
+ 40.901793
+ ],
+ [
+ -73.862643,
+ 40.901474
+ ],
+ [
+ -73.860006,
+ 40.900565
+ ],
+ [
+ -73.85931,
+ 40.900479
+ ],
+ [
+ -73.859604,
+ 40.902178
+ ],
+ [
+ -73.857199,
+ 40.902878
+ ],
+ [
+ -73.856324,
+ 40.906166
+ ],
+ [
+ -73.854104,
+ 40.906679
+ ],
+ [
+ -73.854881,
+ 40.908217
+ ],
+ [
+ -73.852678,
+ 40.909899
+ ],
+ [
+ -73.851123,
+ 40.910009
+ ],
+ [
+ -73.85279,
+ 40.907073
+ ],
+ [
+ -73.851506,
+ 40.906645
+ ],
+ [
+ -73.850225,
+ 40.907368
+ ],
+ [
+ -73.848683,
+ 40.906743
+ ],
+ [
+ -73.847071,
+ 40.906173
+ ],
+ [
+ -73.84532,
+ 40.905582
+ ],
+ [
+ -73.844301,
+ 40.904078
+ ],
+ [
+ -73.842308,
+ 40.903988
+ ],
+ [
+ -73.841318,
+ 40.903987
+ ],
+ [
+ -73.840999,
+ 40.902812
+ ],
+ [
+ -73.839155,
+ 40.899226
+ ],
+ [
+ -73.839649,
+ 40.897891
+ ],
+ [
+ -73.839655,
+ 40.897249
+ ],
+ [
+ -73.838985,
+ 40.895602
+ ],
+ [
+ -73.838407,
+ 40.894061
+ ],
+ [
+ -73.837337,
+ 40.893814
+ ],
+ [
+ -73.833595,
+ 40.892706
+ ],
+ [
+ -73.827943,
+ 40.890928
+ ],
+ [
+ -73.827224,
+ 40.890785
+ ],
+ [
+ -73.824047,
+ 40.889866
+ ],
+ [
+ -73.823113,
+ 40.890777
+ ],
+ [
+ -73.823244,
+ 40.891199
+ ],
+ [
+ -73.819719,
+ 40.890206
+ ],
+ [
+ -73.792942,
+ 40.883411
+ ],
+ [
+ -73.783702,
+ 40.881078
+ ],
+ [
+ -73.7835452253621,
+ 40.881039556340504
+ ],
+ [
+ -73.784803,
+ 40.878528
+ ],
+ [
+ -73.78377754459801,
+ 40.8737425414573
+ ],
+ [
+ -73.783366,
+ 40.871822
+ ],
+ [
+ -73.78598,
+ 40.869485
+ ],
+ [
+ -73.791209,
+ 40.868946
+ ],
+ [
+ -73.793111,
+ 40.863554
+ ],
+ [
+ -73.7916621178674,
+ 40.8618558766405
+ ],
+ [
+ -73.7903979349253,
+ 40.8603742250026
+ ],
+ [
+ -73.788786,
+ 40.858485
+ ],
+ [
+ -73.78806,
+ 40.854131
+ ],
+ [
+ -73.784754,
+ 40.851793
+ ],
+ [
+ -73.7845503224974,
+ 40.851442879952
+ ],
+ [
+ -73.7837996691585,
+ 40.8501525126813
+ ],
+ [
+ -73.782174,
+ 40.847358
+ ],
+ [
+ -73.78215411796849,
+ 40.8466849564146
+ ],
+ [
+ -73.782093,
+ 40.844616
+ ],
+ [
+ -73.78222718192339,
+ 40.8427349527882
+ ],
+ [
+ -73.782254,
+ 40.842359
+ ],
+ [
+ -73.781206,
+ 40.838891
+ ],
+ [
+ -73.782577,
+ 40.837601
+ ],
+ [
+ -73.78355658844929,
+ 40.8369889470619
+ ],
+ [
+ -73.783867,
+ 40.836795
+ ],
+ [
+ -73.785399,
+ 40.838004
+ ],
+ [
+ -73.788221,
+ 40.842036
+ ],
+ [
+ -73.7895699824843,
+ 40.8441939896915
+ ],
+ [
+ -73.791044,
+ 40.846552
+ ],
+ [
+ -73.7910205455361,
+ 40.8466260683397
+ ],
+ [
+ -73.789512,
+ 40.85139
+ ],
+ [
+ -73.7921879532588,
+ 40.8557197529014
+ ],
+ [
+ -73.792253,
+ 40.855825
+ ],
+ [
+ -73.79247106279401,
+ 40.8557905540495
+ ],
+ [
+ -73.793785,
+ 40.855583
+ ],
+ [
+ -73.7941162409583,
+ 40.8552594023289
+ ],
+ [
+ -73.797252,
+ 40.852196
+ ],
+ [
+ -73.799543,
+ 40.848027
+ ],
+ [
+ -73.800110788223,
+ 40.8481406616827
+ ],
+ [
+ -73.8004072944909,
+ 40.8482000172664
+ ],
+ [
+ -73.801726,
+ 40.848464
+ ],
+ [
+ -73.80370186327909,
+ 40.8519687297106
+ ],
+ [
+ -73.80547,
+ 40.855105
+ ],
+ [
+ -73.804757,
+ 40.858521
+ ],
+ [
+ -73.80500555752059,
+ 40.8585460300561
+ ],
+ [
+ -73.80758908528439,
+ 40.858806194563
+ ],
+ [
+ -73.8077204350357,
+ 40.8588194216487
+ ],
+ [
+ -73.808322,
+ 40.85888
+ ],
+ [
+ -73.8115185181963,
+ 40.8587455041432
+ ],
+ [
+ -73.8126,
+ 40.8587
+ ],
+ [
+ -73.8126,
+ 40.854386
+ ],
+ [
+ -73.81657942773289,
+ 40.8535006979629
+ ],
+ [
+ -73.816641,
+ 40.853487
+ ],
+ [
+ -73.8161524601055,
+ 40.851023059662595
+ ],
+ [
+ -73.815928,
+ 40.849891
+ ],
+ [
+ -73.8149671041833,
+ 40.84891900981209
+ ],
+ [
+ -73.81281,
+ 40.846737
+ ],
+ [
+ -73.81463653580009,
+ 40.839066078303894
+ ],
+ [
+ -73.8153051029247,
+ 40.8362582898877
+ ],
+ [
+ -73.815574,
+ 40.835129
+ ],
+ [
+ -73.815205,
+ 40.831075
+ ],
+ [
+ -73.8144318178375,
+ 40.8297431494233
+ ],
+ [
+ -73.81312326035459,
+ 40.8274890841813
+ ],
+ [
+ -73.8120889264041,
+ 40.8257073846865
+ ],
+ [
+ -73.811889,
+ 40.825363
+ ],
+ [
+ -73.808084,
+ 40.826335
+ ],
+ [
+ -73.8077608366193,
+ 40.825629133602696
+ ],
+ [
+ -73.8062520401286,
+ 40.8223335598883
+ ],
+ [
+ -73.804518,
+ 40.818546
+ ],
+ [
+ -73.800479,
+ 40.818061
+ ],
+ [
+ -73.7980946346237,
+ 40.8161941184343
+ ],
+ [
+ -73.7977145646232,
+ 40.81589653582189
+ ],
+ [
+ -73.7976000617692,
+ 40.81580688376209
+ ],
+ [
+ -73.797332,
+ 40.815597
+ ],
+ [
+ -73.802618,
+ 40.812305
+ ],
+ [
+ -73.8007922494588,
+ 40.8100607283042
+ ],
+ [
+ -73.800716,
+ 40.809967
+ ],
+ [
+ -73.79723956685969,
+ 40.8091166862044
+ ],
+ [
+ -73.79119,
+ 40.807637
+ ],
+ [
+ -73.7909151941449,
+ 40.8072807960966
+ ],
+ [
+ -73.79087124917369,
+ 40.8072238345364
+ ],
+ [
+ -73.7864224990023,
+ 40.8014573555951
+ ],
+ [
+ -73.78173803222069,
+ 40.7953853403085
+ ],
+ [
+ -73.781369,
+ 40.794907
+ ],
+ [
+ -73.77885,
+ 40.797193
+ ],
+ [
+ -73.775558,
+ 40.795613
+ ],
+ [
+ -73.770293,
+ 40.788376
+ ],
+ [
+ -73.7741389097254,
+ 40.7863202798795
+ ],
+ [
+ -73.774334,
+ 40.786216
+ ],
+ [
+ -73.7740787591547,
+ 40.7859694239389
+ ],
+ [
+ -73.7703387934199,
+ 40.7823564206272
+ ],
+ [
+ -73.7675451454684,
+ 40.7796576099919
+ ],
+ [
+ -73.767441,
+ 40.779557
+ ],
+ [
+ -73.7670348596146,
+ 40.77848043955719
+ ],
+ [
+ -73.7661154058307,
+ 40.7760432340773
+ ],
+ [
+ -73.76554,
+ 40.774518
+ ],
+ [
+ -73.7635865861473,
+ 40.772932960961
+ ],
+ [
+ -73.7635021041273,
+ 40.772864410561596
+ ],
+ [
+ -73.7615885976999,
+ 40.771311753205005
+ ],
+ [
+ -73.7613603814722,
+ 40.771126573996895
+ ],
+ [
+ -73.758885,
+ 40.769118
+ ],
+ [
+ -73.75837938466749,
+ 40.76955555173
+ ],
+ [
+ -73.75587934721929,
+ 40.771719045675596
+ ],
+ [
+ -73.755557,
+ 40.771998
+ ],
+ [
+ -73.753656,
+ 40.773438
+ ],
+ [
+ -73.7542598582417,
+ 40.7742888294776
+ ],
+ [
+ -73.755881,
+ 40.776573
+ ],
+ [
+ -73.75547359639701,
+ 40.777584
+ ],
+ [
+ -73.7554263694168,
+ 40.777701196992304
+ ],
+ [
+ -73.754606,
+ 40.779737
+ ],
+ [
+ -73.7543402603258,
+ 40.7799670361472
+ ],
+ [
+ -73.7530018625745,
+ 40.78112561310049
+ ],
+ [
+ -73.75145101008741,
+ 40.782468100375205
+ ],
+ [
+ -73.749664,
+ 40.782106
+ ],
+ [
+ -73.739598,
+ 40.776075
+ ],
+ [
+ -73.739376,
+ 40.776014
+ ],
+ [
+ -73.738862,
+ 40.775573
+ ],
+ [
+ -73.733893,
+ 40.772527
+ ],
+ [
+ -73.729706,
+ 40.770054
+ ],
+ [
+ -73.727729,
+ 40.768802
+ ],
+ [
+ -73.722484,
+ 40.765527
+ ],
+ [
+ -73.721143,
+ 40.764873
+ ],
+ [
+ -73.720713,
+ 40.764532
+ ],
+ [
+ -73.713325,
+ 40.75973
+ ],
+ [
+ -73.707825,
+ 40.756216
+ ],
+ [
+ -73.701633,
+ 40.752493
+ ],
+ [
+ -73.701168,
+ 40.748865
+ ],
+ [
+ -73.700872,
+ 40.746866
+ ],
+ [
+ -73.700768,
+ 40.745014
+ ],
+ [
+ -73.700582,
+ 40.743184
+ ],
+ [
+ -73.700292,
+ 40.74105
+ ],
+ [
+ -73.70002,
+ 40.73939
+ ],
+ [
+ -73.700016,
+ 40.739272
+ ],
+ [
+ -73.701471,
+ 40.737512
+ ],
+ [
+ -73.70259,
+ 40.73551
+ ],
+ [
+ -73.704599,
+ 40.732502
+ ],
+ [
+ -73.704869,
+ 40.731997
+ ],
+ [
+ -73.705269,
+ 40.731513
+ ],
+ [
+ -73.707647,
+ 40.727796
+ ],
+ [
+ -73.70967,
+ 40.727346
+ ],
+ [
+ -73.71047,
+ 40.727173
+ ],
+ [
+ -73.712421,
+ 40.72691
+ ],
+ [
+ -73.716684,
+ 40.726375
+ ],
+ [
+ -73.720913,
+ 40.725339
+ ],
+ [
+ -73.721193,
+ 40.725267
+ ],
+ [
+ -73.724197,
+ 40.724455
+ ],
+ [
+ -73.724722,
+ 40.724314
+ ],
+ [
+ -73.725672,
+ 40.724038
+ ],
+ [
+ -73.728162,
+ 40.723084
+ ],
+ [
+ -73.729559,
+ 40.72258
+ ],
+ [
+ -73.730326,
+ 40.722157
+ ],
+ [
+ -73.729176,
+ 40.719167
+ ],
+ [
+ -73.728501,
+ 40.716706
+ ],
+ [
+ -73.726971,
+ 40.710715
+ ],
+ [
+ -73.727047,
+ 40.709497
+ ],
+ [
+ -73.726895,
+ 40.7058
+ ],
+ [
+ -73.726781,
+ 40.703145
+ ],
+ [
+ -73.726762,
+ 40.702768
+ ],
+ [
+ -73.726783,
+ 40.701987
+ ],
+ [
+ -73.726503,
+ 40.696886
+ ],
+ [
+ -73.726258,
+ 40.690611
+ ],
+ [
+ -73.725996,
+ 40.686932
+ ],
+ [
+ -73.725926,
+ 40.686225
+ ],
+ [
+ -73.725821,
+ 40.68395
+ ],
+ [
+ -73.725843,
+ 40.683575
+ ],
+ [
+ -73.725861,
+ 40.683223
+ ],
+ [
+ -73.72563,
+ 40.679588
+ ],
+ [
+ -73.725841,
+ 40.678753
+ ],
+ [
+ -73.726198,
+ 40.677381
+ ],
+ [
+ -73.726543,
+ 40.676487
+ ],
+ [
+ -73.727542,
+ 40.67416
+ ],
+ [
+ -73.72807,
+ 40.671608
+ ],
+ [
+ -73.727926,
+ 40.670097
+ ],
+ [
+ -73.728264,
+ 40.668073
+ ],
+ [
+ -73.728222,
+ 40.667314
+ ],
+ [
+ -73.728272,
+ 40.66644
+ ],
+ [
+ -73.728107,
+ 40.665345
+ ],
+ [
+ -73.727834,
+ 40.663976
+ ],
+ [
+ -73.727814,
+ 40.663224
+ ],
+ [
+ -73.727592,
+ 40.661094
+ ],
+ [
+ -73.726444,
+ 40.659162
+ ],
+ [
+ -73.724787,
+ 40.654001
+ ],
+ [
+ -73.724874,
+ 40.653447
+ ],
+ [
+ -73.724984,
+ 40.652678
+ ],
+ [
+ -73.72853,
+ 40.650973
+ ],
+ [
+ -73.729739,
+ 40.650558
+ ],
+ [
+ -73.732208,
+ 40.650091
+ ],
+ [
+ -73.734388,
+ 40.649821
+ ],
+ [
+ -73.735135,
+ 40.649732
+ ],
+ [
+ -73.736735,
+ 40.6491
+ ],
+ [
+ -73.739045,
+ 40.648201
+ ],
+ [
+ -73.741437,
+ 40.646889
+ ],
+ [
+ -73.741428,
+ 40.640502
+ ],
+ [
+ -73.742283,
+ 40.640121
+ ],
+ [
+ -73.739471,
+ 40.635706
+ ],
+ [
+ -73.73996,
+ 40.635144
+ ],
+ [
+ -73.74265,
+ 40.635045
+ ],
+ [
+ -73.74127,
+ 40.637257
+ ],
+ [
+ -73.742361,
+ 40.638093
+ ],
+ [
+ -73.744177,
+ 40.637356
+ ],
+ [
+ -73.746022,
+ 40.635212
+ ],
+ [
+ -73.748001,
+ 40.634631
+ ],
+ [
+ -73.767425,
+ 40.626606
+ ],
+ [
+ -73.768709,
+ 40.624386
+ ],
+ [
+ -73.768761,
+ 40.624352
+ ],
+ [
+ -73.768553,
+ 40.623155
+ ],
+ [
+ -73.767571,
+ 40.621477
+ ],
+ [
+ -73.767459,
+ 40.620511
+ ],
+ [
+ -73.766719,
+ 40.615004
+ ],
+ [
+ -73.765931,
+ 40.614153
+ ],
+ [
+ -73.763454,
+ 40.61369
+ ],
+ [
+ -73.760021,
+ 40.611349
+ ],
+ [
+ -73.75891,
+ 40.611206
+ ],
+ [
+ -73.757235,
+ 40.610993
+ ],
+ [
+ -73.754732,
+ 40.610405
+ ],
+ [
+ -73.753458,
+ 40.61052
+ ],
+ [
+ -73.750088,
+ 40.611641
+ ],
+ [
+ -73.74912,
+ 40.611794
+ ],
+ [
+ -73.748216,
+ 40.612011
+ ],
+ [
+ -73.746942,
+ 40.611775
+ ],
+ [
+ -73.745633,
+ 40.611756
+ ],
+ [
+ -73.744567,
+ 40.610117
+ ],
+ [
+ -73.743355,
+ 40.607499
+ ],
+ [
+ -73.740571,
+ 40.60488
+ ],
+ [
+ -73.738151,
+ 40.60271
+ ],
+ [
+ -73.738309,
+ 40.598208
+ ],
+ [
+ -73.738037,
+ 40.595913
+ ],
+ [
+ -73.737637,
+ 40.594415
+ ],
+ [
+ -73.737521,
+ 40.59392
+ ],
+ [
+ -73.737185,
+ 40.592965
+ ],
+ [
+ -73.743237,
+ 40.592839
+ ],
+ [
+ -73.74338,
+ 40.592847
+ ],
+ [
+ -73.744469,
+ 40.592904
+ ],
+ [
+ -73.747749,
+ 40.591503
+ ],
+ [
+ -73.752371,
+ 40.587965
+ ],
+ [
+ -73.7548889533319,
+ 40.585891180684
+ ],
+ [
+ -73.7552665240504,
+ 40.5908624008346
+ ],
+ [
+ -73.755269,
+ 40.590895
+ ],
+ [
+ -73.7560282162845,
+ 40.590889747778895
+ ],
+ [
+ -73.76362228847199,
+ 40.5908372123591
+ ],
+ [
+ -73.76375782345809,
+ 40.5908362747347
+ ],
+ [
+ -73.7675356211426,
+ 40.590810140115195
+ ],
+ [
+ -73.7696436778067,
+ 40.5907955566824
+ ],
+ [
+ -73.774928,
+ 40.590759
+ ],
+ [
+ -73.7853023473749,
+ 40.588762557547795
+ ],
+ [
+ -73.7857591786223,
+ 40.5886746448085
+ ],
+ [
+ -73.7884401183853,
+ 40.588158723974004
+ ],
+ [
+ -73.7884870692082,
+ 40.588149688743904
+ ],
+ [
+ -73.79089076184918,
+ 40.587687121426896
+ ],
+ [
+ -73.79559440271939,
+ 40.586781951397896
+ ],
+ [
+ -73.8014345864318,
+ 40.585658064731
+ ],
+ [
+ -73.806834,
+ 40.584619
+ ],
+ [
+ -73.8098659330526,
+ 40.58380334469479
+ ],
+ [
+ -73.815495604297,
+ 40.5822888418555
+ ],
+ [
+ -73.8210851044268,
+ 40.5807851459114
+ ],
+ [
+ -73.82949666128839,
+ 40.5785222559136
+ ],
+ [
+ -73.834408,
+ 40.577201
+ ],
+ [
+ -73.8355312954688,
+ 40.576809433605796
+ ],
+ [
+ -73.8370403194943,
+ 40.576283407183695
+ ],
+ [
+ -73.83891901648259,
+ 40.575628517507795
+ ],
+ [
+ -73.84140129860909,
+ 40.574763225793696
+ ],
+ [
+ -73.84380416067549,
+ 40.573925618894
+ ],
+ [
+ -73.8470497674191,
+ 40.572794242008
+ ],
+ [
+ -73.85704282871019,
+ 40.5693107890027
+ ],
+ [
+ -73.8629720953609,
+ 40.5672439226909
+ ],
+ [
+ -73.8725865174353,
+ 40.563892458460494
+ ],
+ [
+ -73.878681,
+ 40.561768
+ ],
+ [
+ -73.87920281584479,
+ 40.561637464268095
+ ],
+ [
+ -73.87932164844759,
+ 40.5616077374958
+ ],
+ [
+ -73.88237072057389,
+ 40.560844991662194
+ ],
+ [
+ -73.89623,
+ 40.557378
+ ],
+ [
+ -73.9010160660574,
+ 40.5568532568131
+ ],
+ [
+ -73.905141,
+ 40.556401
+ ],
+ [
+ -73.917774,
+ 40.55285
+ ],
+ [
+ -73.940591,
+ 40.542896
+ ],
+ [
+ -73.940573712484,
+ 40.54348327300101
+ ],
+ [
+ -73.940247,
+ 40.554582
+ ],
+ [
+ -73.937068,
+ 40.55727
+ ],
+ [
+ -73.9369713506784,
+ 40.55759793049901
+ ],
+ [
+ -73.9354125461796,
+ 40.562886943694195
+ ],
+ [
+ -73.93426954323711,
+ 40.5667651450013
+ ],
+ [
+ -73.9326458019924,
+ 40.5722744881389
+ ],
+ [
+ -73.9316439833185,
+ 40.5756736521711
+ ],
+ [
+ -73.931559,
+ 40.575962
+ ],
+ [
+ -73.937665,
+ 40.575434
+ ],
+ [
+ -73.946295,
+ 40.5756
+ ],
+ [
+ -73.9524802181286,
+ 40.574840135519494
+ ],
+ [
+ -73.955721,
+ 40.574442
+ ],
+ [
+ -73.95942223594291,
+ 40.5740168643515
+ ],
+ [
+ -73.9820844563704,
+ 40.5714138101483
+ ],
+ [
+ -73.9907535993926,
+ 40.570418045004494
+ ],
+ [
+ -73.991346,
+ 40.57035
+ ],
+ [
+ -74.0020519616197,
+ 40.5706228970609
+ ],
+ [
+ -74.002056,
+ 40.570623
+ ],
+ [
+ -74.0022836477874,
+ 40.5707383658818
+ ],
+ [
+ -74.005673,
+ 40.572456
+ ],
+ [
+ -74.0087571397769,
+ 40.5734625108864
+ ],
+ [
+ -74.0107121806173,
+ 40.5741005396502
+ ],
+ [
+ -74.012022,
+ 40.574528
+ ],
+ [
+ -74.0123228616252,
+ 40.575652678827
+ ],
+ [
+ -74.012996,
+ 40.578169
+ ],
+ [
+ -74.0120188013172,
+ 40.579099473126
+ ],
+ [
+ -74.009608,
+ 40.581395
+ ],
+ [
+ -74.005002,
+ 40.58228
+ ],
+ [
+ -74.00404540894819,
+ 40.5821762351653
+ ],
+ [
+ -74.0031775057949,
+ 40.5820820906225
+ ],
+ [
+ -74.001674,
+ 40.581919
+ ],
+ [
+ -74.00167301890579,
+ 40.581920788762794
+ ],
+ [
+ -74.0013361867149,
+ 40.5825349121006
+ ],
+ [
+ -74.000486,
+ 40.584085
+ ],
+ [
+ -74.000586991197,
+ 40.5870718783011
+ ],
+ [
+ -74.000724,
+ 40.591124
+ ],
+ [
+ -74.00130241758559,
+ 40.5921713497932
+ ],
+ [
+ -74.00136505929069,
+ 40.59228477611101
+ ],
+ [
+ -74.0022422905347,
+ 40.593873192481595
+ ],
+ [
+ -74.0022738340043,
+ 40.5939303087367
+ ],
+ [
+ -74.00320438943919,
+ 40.595615280056
+ ],
+ [
+ -74.003281,
+ 40.595754
+ ],
+ [
+ -74.0042168208041,
+ 40.5963703319488
+ ],
+ [
+ -74.00572229100179,
+ 40.5973618352118
+ ],
+ [
+ -74.00577945986939,
+ 40.597399486650396
+ ],
+ [
+ -74.0077100448287,
+ 40.5986709706622
+ ],
+ [
+ -74.00790676112359,
+ 40.598800528091196
+ ],
+ [
+ -74.0084384949163,
+ 40.5991507281757
+ ],
+ [
+ -74.009184756705,
+ 40.59964221648259
+ ],
+ [
+ -74.0093058714376,
+ 40.599721982693
+ ],
+ [
+ -74.00932714037779,
+ 40.599735990425394
+ ],
+ [
+ -74.0105327821987,
+ 40.600530026601696
+ ],
+ [
+ -74.0105671795466,
+ 40.6005526807085
+ ],
+ [
+ -74.010926,
+ 40.600789
+ ],
+ [
+ -74.0110494523112,
+ 40.6008156238927
+ ],
+ [
+ -74.0113370651283,
+ 40.6008776508625
+ ],
+ [
+ -74.01160983117059,
+ 40.6009364759568
+ ],
+ [
+ -74.0146169621317,
+ 40.6015849978945
+ ],
+ [
+ -74.0148563837204,
+ 40.6016366318787
+ ],
+ [
+ -74.0150890658452,
+ 40.60168681242101
+ ],
+ [
+ -74.01827563110801,
+ 40.6023740314033
+ ],
+ [
+ -74.0189581790272,
+ 40.602521230612396
+ ],
+ [
+ -74.0196250708203,
+ 40.602665053400095
+ ],
+ [
+ -74.0271720774701,
+ 40.6042926510802
+ ],
+ [
+ -74.0278791387297,
+ 40.6044451368695
+ ],
+ [
+ -74.031384,
+ 40.605201
+ ],
+ [
+ -74.0354949628475,
+ 40.609075003863005
+ ],
+ [
+ -74.0358058157354,
+ 40.6093679389571
+ ],
+ [
+ -74.0363843681629,
+ 40.6099131431883
+ ],
+ [
+ -74.03638844894151,
+ 40.6099169887477
+ ],
+ [
+ -74.0392655790145,
+ 40.6126282788836
+ ],
+ [
+ -74.03959,
+ 40.612934
+ ],
+ [
+ -74.0395989873548,
+ 40.6129719398858
+ ],
+ [
+ -74.0396105002328,
+ 40.613020541202296
+ ],
+ [
+ -74.0396194803355,
+ 40.613058450473694
+ ],
+ [
+ -74.0399350595924,
+ 40.6143906601431
+ ],
+ [
+ -74.040247207532,
+ 40.6157083845955
+ ],
+ [
+ -74.0405657471589,
+ 40.6170530913903
+ ],
+ [
+ -74.0409710419105,
+ 40.6187640327003
+ ],
+ [
+ -74.0410042130619,
+ 40.6189040638579
+ ],
+ [
+ -74.0413991059603,
+ 40.6205710940132
+ ],
+ [
+ -74.0414213288962,
+ 40.6206649075623
+ ],
+ [
+ -74.0416287977179,
+ 40.621540731825895
+ ],
+ [
+ -74.04181921329939,
+ 40.622344566278
+ ],
+ [
+ -74.0418612425826,
+ 40.6225219918099
+ ],
+ [
+ -74.04186498283079,
+ 40.6225377811708
+ ],
+ [
+ -74.042412,
+ 40.624847
+ ],
+ [
+ -74.0420116265256,
+ 40.626048022196
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.04692,
+ 40.691139
+ ],
+ [
+ -74.04086,
+ 40.700117
+ ],
+ [
+ -74.040018,
+ 40.700678
+ ],
+ [
+ -74.039401,
+ 40.700454
+ ],
+ [
+ -74.037998,
+ 40.698995
+ ],
+ [
+ -74.043441,
+ 40.68968
+ ],
+ [
+ -74.044451,
+ 40.688445
+ ],
+ [
+ -74.046359,
+ 40.689175
+ ],
+ [
+ -74.047313,
+ 40.690466
+ ],
+ [
+ -74.04692,
+ 40.691139
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.161704,
+ 40.64586
+ ],
+ [
+ -74.16060478578719,
+ 40.6454310211755
+ ],
+ [
+ -74.158583,
+ 40.644642
+ ],
+ [
+ -74.15811153611439,
+ 40.6440004249936
+ ],
+ [
+ -74.157552,
+ 40.643239
+ ],
+ [
+ -74.159192,
+ 40.641448
+ ],
+ [
+ -74.161255,
+ 40.64179
+ ],
+ [
+ -74.161704,
+ 40.64586
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.256088,
+ 40.507903
+ ],
+ [
+ -74.2535451654708,
+ 40.5124029009152
+ ],
+ [
+ -74.252702,
+ 40.513895
+ ],
+ [
+ -74.2483122509113,
+ 40.5170296404742
+ ],
+ [
+ -74.2429340991358,
+ 40.52087008144039
+ ],
+ [
+ -74.242888,
+ 40.520903
+ ],
+ [
+ -74.2424276803187,
+ 40.5250323383169
+ ],
+ [
+ -74.241732,
+ 40.531273
+ ],
+ [
+ -74.2418807347443,
+ 40.531569759596
+ ],
+ [
+ -74.2439756507677,
+ 40.535749592866495
+ ],
+ [
+ -74.2452342160472,
+ 40.5382607164483
+ ],
+ [
+ -74.247460845254,
+ 40.542703347434895
+ ],
+ [
+ -74.247808,
+ 40.543396
+ ],
+ [
+ -74.229002,
+ 40.555041
+ ],
+ [
+ -74.2173831725667,
+ 40.5549926083822
+ ],
+ [
+ -74.2172078468215,
+ 40.554991878162504
+ ],
+ [
+ -74.216997,
+ 40.554991
+ ],
+ [
+ -74.2162681198036,
+ 40.5556961408905
+ ],
+ [
+ -74.2156036234098,
+ 40.5563389949304
+ ],
+ [
+ -74.21336130505729,
+ 40.558508281965004
+ ],
+ [
+ -74.210887,
+ 40.560902
+ ],
+ [
+ -74.208097356718,
+ 40.5725104760836
+ ],
+ [
+ -74.2064130996187,
+ 40.5795191349982
+ ],
+ [
+ -74.20626854513249,
+ 40.5801206661353
+ ],
+ [
+ -74.2049445860231,
+ 40.5856300256136
+ ],
+ [
+ -74.20433903751469,
+ 40.5881498801854
+ ],
+ [
+ -74.204054,
+ 40.589336
+ ],
+ [
+ -74.19682,
+ 40.597037
+ ],
+ [
+ -74.195407,
+ 40.601806
+ ],
+ [
+ -74.196096,
+ 40.616169
+ ],
+ [
+ -74.20052350564639,
+ 40.6168352049125
+ ],
+ [
+ -74.200994,
+ 40.616906
+ ],
+ [
+ -74.201812,
+ 40.619507
+ ],
+ [
+ -74.2014957902445,
+ 40.6225718219896
+ ],
+ [
+ -74.20058,
+ 40.631448
+ ],
+ [
+ -74.1988473083377,
+ 40.6331021161101
+ ],
+ [
+ -74.1964546854975,
+ 40.6353862362867
+ ],
+ [
+ -74.1918025434625,
+ 40.6398274090899
+ ],
+ [
+ -74.1894,
+ 40.642121
+ ],
+ [
+ -74.1891166285585,
+ 40.6422256218809
+ ],
+ [
+ -74.1868204209173,
+ 40.6430733910176
+ ],
+ [
+ -74.1824082385683,
+ 40.644702386564
+ ],
+ [
+ -74.180191,
+ 40.645521
+ ],
+ [
+ -74.1786904077589,
+ 40.6454197481161
+ ],
+ [
+ -74.174085,
+ 40.645109
+ ],
+ [
+ -74.17398937426769,
+ 40.6450376609468
+ ],
+ [
+ -74.17109190743258,
+ 40.6428760823022
+ ],
+ [
+ -74.170187,
+ 40.642201
+ ],
+ [
+ -74.1675872808525,
+ 40.6417003569784
+ ],
+ [
+ -74.1645641399081,
+ 40.6411181731611
+ ],
+ [
+ -74.1610407609049,
+ 40.6404396555942
+ ],
+ [
+ -74.16024243519159,
+ 40.6402859173731
+ ],
+ [
+ -74.1544994311523,
+ 40.6391799537161
+ ],
+ [
+ -74.152973,
+ 40.638886
+ ],
+ [
+ -74.1488612134467,
+ 40.6393017310039
+ ],
+ [
+ -74.1430961731759,
+ 40.639884617773
+ ],
+ [
+ -74.14303745072179,
+ 40.6398905550327
+ ],
+ [
+ -74.1309229607627,
+ 40.6411154165392
+ ],
+ [
+ -74.1292770094533,
+ 40.6412818339788
+ ],
+ [
+ -74.1210391643545,
+ 40.6421147389869
+ ],
+ [
+ -74.120186,
+ 40.642201
+ ],
+ [
+ -74.11229408941419,
+ 40.643699715995
+ ],
+ [
+ -74.1106905509337,
+ 40.644004236521894
+ ],
+ [
+ -74.10146955607169,
+ 40.645755352723704
+ ],
+ [
+ -74.1001347724892,
+ 40.646008835259195
+ ],
+ [
+ -74.100071872149,
+ 40.6460207803699
+ ],
+ [
+ -74.0899307181427,
+ 40.6479466397106
+ ],
+ [
+ -74.08730452241511,
+ 40.648445368313794
+ ],
+ [
+ -74.086485,
+ 40.648601
+ ],
+ [
+ -74.0806364031312,
+ 40.6483251488129
+ ],
+ [
+ -74.0793744563619,
+ 40.648265628637006
+ ],
+ [
+ -74.075884,
+ 40.648101
+ ],
+ [
+ -74.0735657672983,
+ 40.645519979277
+ ],
+ [
+ -74.0734354055466,
+ 40.645374840101596
+ ],
+ [
+ -74.07281871736029,
+ 40.6446882459614
+ ],
+ [
+ -74.0716816684954,
+ 40.643422304591
+ ],
+ [
+ -74.0697,
+ 40.641216
+ ],
+ [
+ -74.0693220483931,
+ 40.638096191088394
+ ],
+ [
+ -74.06803783282508,
+ 40.627495608633595
+ ],
+ [
+ -74.067753032006,
+ 40.6251447147171
+ ],
+ [
+ -74.067598,
+ 40.623865
+ ],
+ [
+ -74.0653012746611,
+ 40.6201075282129
+ ],
+ [
+ -74.0647824572083,
+ 40.61925873627919
+ ],
+ [
+ -74.06314475518829,
+ 40.6165794350013
+ ],
+ [
+ -74.0626450791654,
+ 40.6157619586898
+ ],
+ [
+ -74.06256068103669,
+ 40.6156238822806
+ ],
+ [
+ -74.060345,
+ 40.611999
+ ],
+ [
+ -74.0568877200151,
+ 40.608014508759695
+ ],
+ [
+ -74.053125,
+ 40.603678
+ ],
+ [
+ -74.0578910875872,
+ 40.5956734270858
+ ],
+ [
+ -74.0590625288111,
+ 40.593706009047395
+ ],
+ [
+ -74.0591792159282,
+ 40.593510034777196
+ ],
+ [
+ -74.059184,
+ 40.593502
+ ],
+ [
+ -74.0641090823883,
+ 40.5883580250611
+ ],
+ [
+ -74.068184,
+ 40.584102
+ ],
+ [
+ -74.0757909128595,
+ 40.5781683186694
+ ],
+ [
+ -74.0806053103414,
+ 40.57441290553609
+ ],
+ [
+ -74.0843946097399,
+ 40.57145710789359
+ ],
+ [
+ -74.08462942013689,
+ 40.5712739468538
+ ],
+ [
+ -74.090797,
+ 40.566463
+ ],
+ [
+ -74.0908633976348,
+ 40.566400196200604
+ ],
+ [
+ -74.09374011614909,
+ 40.563679182824
+ ],
+ [
+ -74.0946360825336,
+ 40.562831711475894
+ ],
+ [
+ -74.0984213954874,
+ 40.559251282202005
+ ],
+ [
+ -74.09921766378629,
+ 40.5584981126854
+ ],
+ [
+ -74.09951794921389,
+ 40.5582140804934
+ ],
+ [
+ -74.10389629455949,
+ 40.5540727172723
+ ],
+ [
+ -74.1052726951982,
+ 40.552770815633096
+ ],
+ [
+ -74.1070611134903,
+ 40.5510791971896
+ ],
+ [
+ -74.111471,
+ 40.546908
+ ],
+ [
+ -74.1125450843077,
+ 40.5475780974811
+ ],
+ [
+ -74.112585,
+ 40.547603
+ ],
+ [
+ -74.1128288683874,
+ 40.5474711763487
+ ],
+ [
+ -74.11290197723679,
+ 40.547431657182
+ ],
+ [
+ -74.121672,
+ 40.542691
+ ],
+ [
+ -74.12933629984259,
+ 40.536480893858695
+ ],
+ [
+ -74.137241,
+ 40.530076
+ ],
+ [
+ -74.1401627032412,
+ 40.5336555507759
+ ],
+ [
+ -74.14023,
+ 40.533738
+ ],
+ [
+ -74.1424250908296,
+ 40.534481549109
+ ],
+ [
+ -74.144428,
+ 40.53516
+ ],
+ [
+ -74.14509205837629,
+ 40.5350556235253
+ ],
+ [
+ -74.145218347156,
+ 40.5350357734969
+ ],
+ [
+ -74.1483362132313,
+ 40.534545708344304
+ ],
+ [
+ -74.148697,
+ 40.534489
+ ],
+ [
+ -74.1491482619542,
+ 40.5342033343376
+ ],
+ [
+ -74.1497595247509,
+ 40.5338163821693
+ ],
+ [
+ -74.1599024643113,
+ 40.527395522797796
+ ],
+ [
+ -74.15996036133559,
+ 40.5273588718202
+ ],
+ [
+ -74.160859,
+ 40.52679
+ ],
+ [
+ -74.164837680164,
+ 40.525120427142
+ ],
+ [
+ -74.168292535341,
+ 40.5236706668712
+ ],
+ [
+ -74.17797516751301,
+ 40.5196075456346
+ ],
+ [
+ -74.177986,
+ 40.519603
+ ],
+ [
+ -74.182157,
+ 40.520634
+ ],
+ [
+ -74.1968192974869,
+ 40.5132846946347
+ ],
+ [
+ -74.19974086810349,
+ 40.5118202914859
+ ],
+ [
+ -74.199923,
+ 40.511729
+ ],
+ [
+ -74.2102979958168,
+ 40.5094860499992
+ ],
+ [
+ -74.210474,
+ 40.509448
+ ],
+ [
+ -74.219787,
+ 40.502603
+ ],
+ [
+ -74.2219094148505,
+ 40.50239727421649
+ ],
+ [
+ -74.23324,
+ 40.501299
+ ],
+ [
+ -74.23651814728228,
+ 40.5000323987746
+ ],
+ [
+ -74.2395391778431,
+ 40.498865141577
+ ],
+ [
+ -74.246688,
+ 40.496103
+ ],
+ [
+ -74.250188,
+ 40.496703
+ ],
+ [
+ -74.25176389759889,
+ 40.4987086878531
+ ],
+ [
+ -74.25437511356469,
+ 40.5020320536278
+ ],
+ [
+ -74.254588,
+ 40.502303
+ ],
+ [
+ -74.25525510723189,
+ 40.5047935336658
+ ],
+ [
+ -74.25604235787159,
+ 40.507732602720594
+ ],
+ [
+ -74.256088,
+ 40.507903
+ ]
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/ny_state_geojson.json b/tests/data/ny_state_geojson.json
new file mode 100644
index 00000000..5fc10d50
--- /dev/null
+++ b/tests/data/ny_state_geojson.json
@@ -0,0 +1,16986 @@
+{
+ "type": "MultiPolygon",
+ "coordinates": [
+ [
+ [
+ [
+ -72.0368298202051,
+ 41.2498425393847
+ ],
+ [
+ -72.034958,
+ 41.255458
+ ],
+ [
+ -72.0337378262375,
+ 41.2571450228543
+ ],
+ [
+ -72.03080617924479,
+ 41.2611983434789
+ ],
+ [
+ -72.029438,
+ 41.26309
+ ],
+ [
+ -72.0280835571657,
+ 41.263917676985
+ ],
+ [
+ -72.0260806793461,
+ 41.2651416015636
+ ],
+ [
+ -72.025486,
+ 41.265505
+ ],
+ [
+ -72.02538070298989,
+ 41.266325771315294
+ ],
+ [
+ -72.024482,
+ 41.273331
+ ],
+ [
+ -72.023422,
+ 41.270994
+ ],
+ [
+ -72.02340256814279,
+ 41.2710263443827
+ ],
+ [
+ -72.02069347846809,
+ 41.2755356320135
+ ],
+ [
+ -72.020495,
+ 41.275866
+ ],
+ [
+ -72.01037535525279,
+ 41.2719217195472
+ ],
+ [
+ -72.007872,
+ 41.270946
+ ],
+ [
+ -72.002669,
+ 41.266398
+ ],
+ [
+ -71.99435,
+ 41.270507
+ ],
+ [
+ -71.9942829662532,
+ 41.2709471947568
+ ],
+ [
+ -71.9941132582708,
+ 41.2720616269288
+ ],
+ [
+ -71.9931070776227,
+ 41.278668977207495
+ ],
+ [
+ -71.992972,
+ 41.279556
+ ],
+ [
+ -71.991117,
+ 41.281331
+ ],
+ [
+ -71.984477,
+ 41.281505
+ ],
+ [
+ -71.98062308748419,
+ 41.2804455231444
+ ],
+ [
+ -71.980061,
+ 41.280291
+ ],
+ [
+ -71.974395,
+ 41.280927
+ ],
+ [
+ -71.97416495721801,
+ 41.2810718364073
+ ],
+ [
+ -71.9689029182154,
+ 41.2843848498299
+ ],
+ [
+ -71.968018,
+ 41.284942
+ ],
+ [
+ -71.9645328976156,
+ 41.28447169206579
+ ],
+ [
+ -71.959926,
+ 41.28385
+ ],
+ [
+ -71.95727708611429,
+ 41.2843181173222
+ ],
+ [
+ -71.9538903057055,
+ 41.2849166307674
+ ],
+ [
+ -71.952864,
+ 41.285098
+ ],
+ [
+ -71.946762,
+ 41.284364
+ ],
+ [
+ -71.9465338785658,
+ 41.2845287979476
+ ],
+ [
+ -71.943563,
+ 41.286675
+ ],
+ [
+ -71.94325615556919,
+ 41.2870112317287
+ ],
+ [
+ -71.939376,
+ 41.291263
+ ],
+ [
+ -71.9384404485204,
+ 41.291214224260194
+ ],
+ [
+ -71.930246,
+ 41.290787
+ ],
+ [
+ -71.92224253360419,
+ 41.2919898226604
+ ],
+ [
+ -71.921383,
+ 41.292119
+ ],
+ [
+ -71.928038,
+ 41.288012
+ ],
+ [
+ -71.928751,
+ 41.28444
+ ],
+ [
+ -71.935259,
+ 41.280579
+ ],
+ [
+ -71.9353958215636,
+ 41.280566690304006
+ ],
+ [
+ -71.9414348982059,
+ 41.2800233607612
+ ],
+ [
+ -71.943962,
+ 41.279796
+ ],
+ [
+ -71.94627,
+ 41.276306
+ ],
+ [
+ -71.952281,
+ 41.27533
+ ],
+ [
+ -71.9548900969305,
+ 41.275441696512004
+ ],
+ [
+ -71.959312,
+ 41.275631
+ ],
+ [
+ -71.9593155603852,
+ 41.2756315182792
+ ],
+ [
+ -71.964107,
+ 41.276329
+ ],
+ [
+ -71.967493,
+ 41.273187
+ ],
+ [
+ -71.97548,
+ 41.269821
+ ],
+ [
+ -71.97927673486201,
+ 41.267912480871495
+ ],
+ [
+ -71.98483,
+ 41.265121
+ ],
+ [
+ -71.991844,
+ 41.260882
+ ],
+ [
+ -71.994717,
+ 41.256451
+ ],
+ [
+ -71.995425452353,
+ 41.256123121225
+ ],
+ [
+ -72.002461,
+ 41.252867
+ ],
+ [
+ -72.0030720196389,
+ 41.2528124384295
+ ],
+ [
+ -72.005955,
+ 41.252555
+ ],
+ [
+ -72.0101766051562,
+ 41.2552541081984
+ ],
+ [
+ -72.010178,
+ 41.255255
+ ],
+ [
+ -72.017122,
+ 41.255425
+ ],
+ [
+ -72.0171233221075,
+ 41.2554242543579
+ ],
+ [
+ -72.025273,
+ 41.250828
+ ],
+ [
+ -72.036846,
+ 41.249794
+ ],
+ [
+ -72.0368298202051,
+ 41.2498425393847
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -72.142929,
+ 41.097811
+ ],
+ [
+ -72.140737,
+ 41.100835
+ ],
+ [
+ -72.132225,
+ 41.104387
+ ],
+ [
+ -72.128352,
+ 41.108131
+ ],
+ [
+ -72.126704,
+ 41.115139
+ ],
+ [
+ -72.129794,
+ 41.123876
+ ],
+ [
+ -72.123173,
+ 41.117053
+ ],
+ [
+ -72.115567,
+ 41.110607
+ ],
+ [
+ -72.09095,
+ 41.103684
+ ],
+ [
+ -72.088422,
+ 41.101541
+ ],
+ [
+ -72.084207,
+ 41.101524
+ ],
+ [
+ -72.079514,
+ 41.100677
+ ],
+ [
+ -72.07764,
+ 41.099348
+ ],
+ [
+ -72.076828,
+ 41.096772
+ ],
+ [
+ -72.078464,
+ 41.09498
+ ],
+ [
+ -72.081167,
+ 41.09394
+ ],
+ [
+ -72.085382,
+ 41.091084
+ ],
+ [
+ -72.086762,
+ 41.085712
+ ],
+ [
+ -72.085092,
+ 41.078506
+ ],
+ [
+ -72.081844,
+ 41.071734
+ ],
+ [
+ -72.085368,
+ 41.069613
+ ],
+ [
+ -72.087283,
+ 41.065464
+ ],
+ [
+ -72.086975,
+ 41.058292
+ ],
+ [
+ -72.095711,
+ 41.05402
+ ],
+ [
+ -72.0972,
+ 41.054884
+ ],
+ [
+ -72.097136,
+ 41.075844
+ ],
+ [
+ -72.103152,
+ 41.086484
+ ],
+ [
+ -72.1064,
+ 41.088883
+ ],
+ [
+ -72.12056,
+ 41.093171
+ ],
+ [
+ -72.139233,
+ 41.092451
+ ],
+ [
+ -72.141921,
+ 41.094371
+ ],
+ [
+ -72.142929,
+ 41.097811
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -72.210995,
+ 41.178946
+ ],
+ [
+ -72.202758,
+ 41.181466
+ ],
+ [
+ -72.18898,
+ 41.189011
+ ],
+ [
+ -72.177689,
+ 41.187244
+ ],
+ [
+ -72.171897,
+ 41.187386
+ ],
+ [
+ -72.16217,
+ 41.192448
+ ],
+ [
+ -72.161034,
+ 41.188671
+ ],
+ [
+ -72.167363,
+ 41.186218
+ ],
+ [
+ -72.179503,
+ 41.183809
+ ],
+ [
+ -72.183975,
+ 41.184664
+ ],
+ [
+ -72.187896,
+ 41.180616
+ ],
+ [
+ -72.198601,
+ 41.164951
+ ],
+ [
+ -72.20017,
+ 41.165928
+ ],
+ [
+ -72.204182,
+ 41.171139
+ ],
+ [
+ -72.211479,
+ 41.17297
+ ],
+ [
+ -72.210995,
+ 41.178946
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.773361,
+ 40.859449
+ ],
+ [
+ -73.7724428951654,
+ 40.859736949576096
+ ],
+ [
+ -73.770552,
+ 40.86033
+ ],
+ [
+ -73.768867,
+ 40.858341
+ ],
+ [
+ -73.765258,
+ 40.855361
+ ],
+ [
+ -73.7662834427055,
+ 40.8547972826635
+ ],
+ [
+ -73.768043,
+ 40.85383
+ ],
+ [
+ -73.76873030709459,
+ 40.85098201195859
+ ],
+ [
+ -73.769236584406,
+ 40.848884155353396
+ ],
+ [
+ -73.769414,
+ 40.848149
+ ],
+ [
+ -73.767179,
+ 40.844866
+ ],
+ [
+ -73.769648,
+ 40.84466
+ ],
+ [
+ -73.7719699256149,
+ 40.847033504858494
+ ],
+ [
+ -73.772349,
+ 40.847421
+ ],
+ [
+ -73.773434,
+ 40.852032
+ ],
+ [
+ -73.773361,
+ 40.859449
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.772776,
+ 40.884599
+ ],
+ [
+ -73.772276,
+ 40.887499
+ ],
+ [
+ -73.770576,
+ 40.888399
+ ],
+ [
+ -73.768276,
+ 40.887599
+ ],
+ [
+ -73.767276,
+ 40.886899
+ ],
+ [
+ -73.76733487876601,
+ 40.8866326436773
+ ],
+ [
+ -73.768221,
+ 40.882624
+ ],
+ [
+ -73.767441,
+ 40.880687
+ ],
+ [
+ -73.770876,
+ 40.879299
+ ],
+ [
+ -73.775276,
+ 40.882199
+ ],
+ [
+ -73.772776,
+ 40.884599
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.027106,
+ 40.685092
+ ],
+ [
+ -74.025442,
+ 40.687976
+ ],
+ [
+ -74.0195,
+ 40.693382
+ ],
+ [
+ -74.01546,
+ 40.693382
+ ],
+ [
+ -74.0149598341925,
+ 40.692975765571596
+ ],
+ [
+ -74.012132,
+ 40.690679
+ ],
+ [
+ -74.013083,
+ 40.687795
+ ],
+ [
+ -74.016173,
+ 40.687075
+ ],
+ [
+ -74.019976,
+ 40.685813
+ ],
+ [
+ -74.025442,
+ 40.684191
+ ],
+ [
+ -74.02602912632729,
+ 40.6845089091472
+ ],
+ [
+ -74.027106,
+ 40.685092
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.04692,
+ 40.691139
+ ],
+ [
+ -74.04086,
+ 40.700117
+ ],
+ [
+ -74.040018,
+ 40.700678
+ ],
+ [
+ -74.039401,
+ 40.700454
+ ],
+ [
+ -74.037998,
+ 40.698995
+ ],
+ [
+ -74.043441,
+ 40.68968
+ ],
+ [
+ -74.044451,
+ 40.688445
+ ],
+ [
+ -74.046359,
+ 40.689175
+ ],
+ [
+ -74.047313,
+ 40.690466
+ ],
+ [
+ -74.04692,
+ 40.691139
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.161704,
+ 40.64586
+ ],
+ [
+ -74.16060478578719,
+ 40.6454310211755
+ ],
+ [
+ -74.158583,
+ 40.644642
+ ],
+ [
+ -74.15811153611439,
+ 40.6440004249936
+ ],
+ [
+ -74.157552,
+ 40.643239
+ ],
+ [
+ -74.159192,
+ 40.641448
+ ],
+ [
+ -74.161255,
+ 40.64179
+ ],
+ [
+ -74.161704,
+ 40.64586
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -74.256088,
+ 40.507903
+ ],
+ [
+ -74.2535451654708,
+ 40.5124029009152
+ ],
+ [
+ -74.252702,
+ 40.513895
+ ],
+ [
+ -74.2483122509113,
+ 40.5170296404742
+ ],
+ [
+ -74.2429340991358,
+ 40.52087008144039
+ ],
+ [
+ -74.242888,
+ 40.520903
+ ],
+ [
+ -74.2424276803187,
+ 40.5250323383169
+ ],
+ [
+ -74.241732,
+ 40.531273
+ ],
+ [
+ -74.2418807347443,
+ 40.531569759596
+ ],
+ [
+ -74.2439756507677,
+ 40.535749592866495
+ ],
+ [
+ -74.2452342160472,
+ 40.5382607164483
+ ],
+ [
+ -74.247460845254,
+ 40.542703347434895
+ ],
+ [
+ -74.247808,
+ 40.543396
+ ],
+ [
+ -74.229002,
+ 40.555041
+ ],
+ [
+ -74.2173831725667,
+ 40.5549926083822
+ ],
+ [
+ -74.2172078468215,
+ 40.554991878162504
+ ],
+ [
+ -74.216997,
+ 40.554991
+ ],
+ [
+ -74.2162681198036,
+ 40.5556961408905
+ ],
+ [
+ -74.2156036234098,
+ 40.5563389949304
+ ],
+ [
+ -74.21336130505729,
+ 40.558508281965004
+ ],
+ [
+ -74.210887,
+ 40.560902
+ ],
+ [
+ -74.208097356718,
+ 40.5725104760836
+ ],
+ [
+ -74.2064130996187,
+ 40.5795191349982
+ ],
+ [
+ -74.20626854513249,
+ 40.5801206661353
+ ],
+ [
+ -74.2049445860231,
+ 40.5856300256136
+ ],
+ [
+ -74.20433903751469,
+ 40.5881498801854
+ ],
+ [
+ -74.204054,
+ 40.589336
+ ],
+ [
+ -74.19682,
+ 40.597037
+ ],
+ [
+ -74.195407,
+ 40.601806
+ ],
+ [
+ -74.196096,
+ 40.616169
+ ],
+ [
+ -74.20052350564639,
+ 40.6168352049125
+ ],
+ [
+ -74.200994,
+ 40.616906
+ ],
+ [
+ -74.201812,
+ 40.619507
+ ],
+ [
+ -74.2014957902445,
+ 40.6225718219896
+ ],
+ [
+ -74.20058,
+ 40.631448
+ ],
+ [
+ -74.1988473083377,
+ 40.6331021161101
+ ],
+ [
+ -74.1964546854975,
+ 40.6353862362867
+ ],
+ [
+ -74.1918025434625,
+ 40.6398274090899
+ ],
+ [
+ -74.1894,
+ 40.642121
+ ],
+ [
+ -74.1891166285585,
+ 40.6422256218809
+ ],
+ [
+ -74.1868204209173,
+ 40.6430733910176
+ ],
+ [
+ -74.1824082385683,
+ 40.644702386564
+ ],
+ [
+ -74.180191,
+ 40.645521
+ ],
+ [
+ -74.1786904077589,
+ 40.6454197481161
+ ],
+ [
+ -74.174085,
+ 40.645109
+ ],
+ [
+ -74.17398937426769,
+ 40.6450376609468
+ ],
+ [
+ -74.17109190743258,
+ 40.6428760823022
+ ],
+ [
+ -74.170187,
+ 40.642201
+ ],
+ [
+ -74.1675872808525,
+ 40.6417003569784
+ ],
+ [
+ -74.1645641399081,
+ 40.6411181731611
+ ],
+ [
+ -74.1610407609049,
+ 40.6404396555942
+ ],
+ [
+ -74.16024243519159,
+ 40.6402859173731
+ ],
+ [
+ -74.1544994311523,
+ 40.6391799537161
+ ],
+ [
+ -74.152973,
+ 40.638886
+ ],
+ [
+ -74.1488612134467,
+ 40.6393017310039
+ ],
+ [
+ -74.1430961731759,
+ 40.639884617773
+ ],
+ [
+ -74.14303745072179,
+ 40.6398905550327
+ ],
+ [
+ -74.1309229607627,
+ 40.6411154165392
+ ],
+ [
+ -74.1292770094533,
+ 40.6412818339788
+ ],
+ [
+ -74.1210391643545,
+ 40.6421147389869
+ ],
+ [
+ -74.120186,
+ 40.642201
+ ],
+ [
+ -74.11229408941419,
+ 40.643699715995
+ ],
+ [
+ -74.1106905509337,
+ 40.644004236521894
+ ],
+ [
+ -74.10146955607169,
+ 40.645755352723704
+ ],
+ [
+ -74.1001347724892,
+ 40.646008835259195
+ ],
+ [
+ -74.100071872149,
+ 40.6460207803699
+ ],
+ [
+ -74.0899307181427,
+ 40.6479466397106
+ ],
+ [
+ -74.08730452241511,
+ 40.648445368313794
+ ],
+ [
+ -74.086485,
+ 40.648601
+ ],
+ [
+ -74.0806364031312,
+ 40.6483251488129
+ ],
+ [
+ -74.0793744563619,
+ 40.648265628637006
+ ],
+ [
+ -74.075884,
+ 40.648101
+ ],
+ [
+ -74.0735657672983,
+ 40.645519979277
+ ],
+ [
+ -74.0734354055466,
+ 40.645374840101596
+ ],
+ [
+ -74.07281871736029,
+ 40.6446882459614
+ ],
+ [
+ -74.0716816684954,
+ 40.643422304591
+ ],
+ [
+ -74.0697,
+ 40.641216
+ ],
+ [
+ -74.0693220483931,
+ 40.638096191088394
+ ],
+ [
+ -74.06803783282508,
+ 40.627495608633595
+ ],
+ [
+ -74.067753032006,
+ 40.6251447147171
+ ],
+ [
+ -74.067598,
+ 40.623865
+ ],
+ [
+ -74.0653012746611,
+ 40.6201075282129
+ ],
+ [
+ -74.0647824572083,
+ 40.61925873627919
+ ],
+ [
+ -74.06314475518829,
+ 40.6165794350013
+ ],
+ [
+ -74.0626450791654,
+ 40.6157619586898
+ ],
+ [
+ -74.06256068103669,
+ 40.6156238822806
+ ],
+ [
+ -74.060345,
+ 40.611999
+ ],
+ [
+ -74.0568877200151,
+ 40.608014508759695
+ ],
+ [
+ -74.053125,
+ 40.603678
+ ],
+ [
+ -74.0578910875872,
+ 40.5956734270858
+ ],
+ [
+ -74.0590625288111,
+ 40.593706009047395
+ ],
+ [
+ -74.0591792159282,
+ 40.593510034777196
+ ],
+ [
+ -74.059184,
+ 40.593502
+ ],
+ [
+ -74.0641090823883,
+ 40.5883580250611
+ ],
+ [
+ -74.068184,
+ 40.584102
+ ],
+ [
+ -74.0757909128595,
+ 40.5781683186694
+ ],
+ [
+ -74.0806053103414,
+ 40.57441290553609
+ ],
+ [
+ -74.0843946097399,
+ 40.57145710789359
+ ],
+ [
+ -74.08462942013689,
+ 40.5712739468538
+ ],
+ [
+ -74.090797,
+ 40.566463
+ ],
+ [
+ -74.0908633976348,
+ 40.566400196200604
+ ],
+ [
+ -74.09374011614909,
+ 40.563679182824
+ ],
+ [
+ -74.0946360825336,
+ 40.562831711475894
+ ],
+ [
+ -74.0984213954874,
+ 40.559251282202005
+ ],
+ [
+ -74.09921766378629,
+ 40.5584981126854
+ ],
+ [
+ -74.09951794921389,
+ 40.5582140804934
+ ],
+ [
+ -74.10389629455949,
+ 40.5540727172723
+ ],
+ [
+ -74.1052726951982,
+ 40.552770815633096
+ ],
+ [
+ -74.1070611134903,
+ 40.5510791971896
+ ],
+ [
+ -74.111471,
+ 40.546908
+ ],
+ [
+ -74.1125450843077,
+ 40.5475780974811
+ ],
+ [
+ -74.112585,
+ 40.547603
+ ],
+ [
+ -74.1128288683874,
+ 40.5474711763487
+ ],
+ [
+ -74.11290197723679,
+ 40.547431657182
+ ],
+ [
+ -74.121672,
+ 40.542691
+ ],
+ [
+ -74.12933629984259,
+ 40.536480893858695
+ ],
+ [
+ -74.137241,
+ 40.530076
+ ],
+ [
+ -74.1401627032412,
+ 40.5336555507759
+ ],
+ [
+ -74.14023,
+ 40.533738
+ ],
+ [
+ -74.1424250908296,
+ 40.534481549109
+ ],
+ [
+ -74.144428,
+ 40.53516
+ ],
+ [
+ -74.14509205837629,
+ 40.5350556235253
+ ],
+ [
+ -74.145218347156,
+ 40.5350357734969
+ ],
+ [
+ -74.1483362132313,
+ 40.534545708344304
+ ],
+ [
+ -74.148697,
+ 40.534489
+ ],
+ [
+ -74.1491482619542,
+ 40.5342033343376
+ ],
+ [
+ -74.1497595247509,
+ 40.5338163821693
+ ],
+ [
+ -74.1599024643113,
+ 40.527395522797796
+ ],
+ [
+ -74.15996036133559,
+ 40.5273588718202
+ ],
+ [
+ -74.160859,
+ 40.52679
+ ],
+ [
+ -74.164837680164,
+ 40.525120427142
+ ],
+ [
+ -74.168292535341,
+ 40.5236706668712
+ ],
+ [
+ -74.17797516751301,
+ 40.5196075456346
+ ],
+ [
+ -74.177986,
+ 40.519603
+ ],
+ [
+ -74.182157,
+ 40.520634
+ ],
+ [
+ -74.1968192974869,
+ 40.5132846946347
+ ],
+ [
+ -74.19974086810349,
+ 40.5118202914859
+ ],
+ [
+ -74.199923,
+ 40.511729
+ ],
+ [
+ -74.2102979958168,
+ 40.5094860499992
+ ],
+ [
+ -74.210474,
+ 40.509448
+ ],
+ [
+ -74.219787,
+ 40.502603
+ ],
+ [
+ -74.2219094148505,
+ 40.50239727421649
+ ],
+ [
+ -74.23324,
+ 40.501299
+ ],
+ [
+ -74.23651814728228,
+ 40.5000323987746
+ ],
+ [
+ -74.2395391778431,
+ 40.498865141577
+ ],
+ [
+ -74.246688,
+ 40.496103
+ ],
+ [
+ -74.250188,
+ 40.496703
+ ],
+ [
+ -74.25176389759889,
+ 40.4987086878531
+ ],
+ [
+ -74.25437511356469,
+ 40.5020320536278
+ ],
+ [
+ -74.254588,
+ 40.502303
+ ],
+ [
+ -74.25525510723189,
+ 40.5047935336658
+ ],
+ [
+ -74.25604235787159,
+ 40.507732602720594
+ ],
+ [
+ -74.256088,
+ 40.507903
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -76.147535,
+ 43.942484
+ ],
+ [
+ -76.145659,
+ 43.943653
+ ],
+ [
+ -76.142569,
+ 43.944167
+ ],
+ [
+ -76.140667,
+ 43.942284
+ ],
+ [
+ -76.1408069963256,
+ 43.9422128759078
+ ],
+ [
+ -76.144708,
+ 43.940231
+ ],
+ [
+ -76.1467593472192,
+ 43.9411717300522
+ ],
+ [
+ -76.147292,
+ 43.941416
+ ],
+ [
+ -76.147535,
+ 43.942484
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -76.187253,
+ 44.013777
+ ],
+ [
+ -76.185114,
+ 44.016683
+ ],
+ [
+ -76.180122,
+ 44.01976
+ ],
+ [
+ -76.173467,
+ 44.024716
+ ],
+ [
+ -76.169664,
+ 44.024887
+ ],
+ [
+ -76.169427,
+ 44.022494
+ ],
+ [
+ -76.176557,
+ 44.017196
+ ],
+ [
+ -76.18345,
+ 44.014632
+ ],
+ [
+ -76.1871756182312,
+ 44.013794397163394
+ ],
+ [
+ -76.187253,
+ 44.013777
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -76.336761,
+ 44.034184
+ ],
+ [
+ -76.33295,
+ 44.036678
+ ],
+ [
+ -76.333191,
+ 44.039536
+ ],
+ [
+ -76.329628,
+ 44.044296
+ ],
+ [
+ -76.317726,
+ 44.051434
+ ],
+ [
+ -76.316536,
+ 44.048458
+ ],
+ [
+ -76.3167977935769,
+ 44.0483332600984
+ ],
+ [
+ -76.3212043405205,
+ 44.0462336202276
+ ],
+ [
+ -76.322255,
+ 44.045733
+ ],
+ [
+ -76.326533,
+ 44.040095
+ ],
+ [
+ -76.321297,
+ 44.037159
+ ],
+ [
+ -76.321297,
+ 44.031208
+ ],
+ [
+ -76.324156,
+ 44.030526
+ ],
+ [
+ -76.329033,
+ 44.034184
+ ],
+ [
+ -76.333786,
+ 44.032993
+ ],
+ [
+ -76.336761,
+ 44.034184
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -76.356691,
+ 43.878246
+ ],
+ [
+ -76.345978,
+ 43.894035
+ ],
+ [
+ -76.330977,
+ 43.902754
+ ],
+ [
+ -76.326428,
+ 43.904375
+ ],
+ [
+ -76.320829,
+ 43.903252
+ ],
+ [
+ -76.315124,
+ 43.905478
+ ],
+ [
+ -76.314174,
+ 43.908389
+ ],
+ [
+ -76.314887,
+ 43.910615
+ ],
+ [
+ -76.314808,
+ 43.913194
+ ],
+ [
+ -76.305182,
+ 43.918133
+ ],
+ [
+ -76.3013,
+ 43.917751
+ ],
+ [
+ -76.305154,
+ 43.913509
+ ],
+ [
+ -76.305099,
+ 43.910152
+ ],
+ [
+ -76.307487,
+ 43.905376
+ ],
+ [
+ -76.314305,
+ 43.898447
+ ],
+ [
+ -76.326393,
+ 43.880974
+ ],
+ [
+ -76.334297,
+ 43.878567
+ ],
+ [
+ -76.341745,
+ 43.879101
+ ],
+ [
+ -76.3421962085954,
+ 43.8791809086978
+ ],
+ [
+ -76.34867113666459,
+ 43.8803276135162
+ ],
+ [
+ -76.34895,
+ 43.880377
+ ],
+ [
+ -76.3500795017486,
+ 43.8798476322155
+ ],
+ [
+ -76.353866,
+ 43.878073
+ ],
+ [
+ -76.354016916824,
+ 43.878082241986
+ ],
+ [
+ -76.356691,
+ 43.878246
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -76.373772,
+ 43.874784
+ ],
+ [
+ -76.367849,
+ 43.879004
+ ],
+ [
+ -76.364173,
+ 43.87856
+ ],
+ [
+ -76.365988,
+ 43.876188
+ ],
+ [
+ -76.368602,
+ 43.875331
+ ],
+ [
+ -76.370762419162,
+ 43.875102421802396
+ ],
+ [
+ -76.373772,
+ 43.874784
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -76.383338,
+ 44.037361
+ ],
+ [
+ -76.379593,
+ 44.045486
+ ],
+ [
+ -76.370079,
+ 44.052029
+ ],
+ [
+ -76.358762,
+ 44.05161
+ ],
+ [
+ -76.351727,
+ 44.054445
+ ],
+ [
+ -76.342117,
+ 44.053814
+ ],
+ [
+ -76.342117,
+ 44.048458
+ ],
+ [
+ -76.346878,
+ 44.03894
+ ],
+ [
+ -76.361748,
+ 44.032993
+ ],
+ [
+ -76.376617,
+ 44.032993
+ ],
+ [
+ -76.38040422634239,
+ 44.0344137070463
+ ],
+ [
+ -76.381378,
+ 44.034779
+ ],
+ [
+ -76.3824879873012,
+ 44.0362412383733
+ ],
+ [
+ -76.383338,
+ 44.037361
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -76.398564,
+ 43.884133
+ ],
+ [
+ -76.396649,
+ 43.885953
+ ],
+ [
+ -76.394578,
+ 43.888076
+ ],
+ [
+ -76.392347,
+ 43.887859
+ ],
+ [
+ -76.393624,
+ 43.885943
+ ],
+ [
+ -76.395759,
+ 43.88273
+ ],
+ [
+ -76.397811,
+ 43.883152
+ ],
+ [
+ -76.398564,
+ 43.884133
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -76.445999,
+ 43.890255
+ ],
+ [
+ -76.426579,
+ 43.908342
+ ],
+ [
+ -76.406471,
+ 43.921188
+ ],
+ [
+ -76.400046,
+ 43.920268
+ ],
+ [
+ -76.396539,
+ 43.921439
+ ],
+ [
+ -76.3906,
+ 43.921888
+ ],
+ [
+ -76.3874362499999,
+ 43.921713
+ ],
+ [
+ -76.377945,
+ 43.921188
+ ],
+ [
+ -76.379532,
+ 43.918619
+ ],
+ [
+ -76.383792,
+ 43.917388
+ ],
+ [
+ -76.386217,
+ 43.91272
+ ],
+ [
+ -76.388603,
+ 43.908127
+ ],
+ [
+ -76.393796,
+ 43.905992
+ ],
+ [
+ -76.399976,
+ 43.901711
+ ],
+ [
+ -76.4077,
+ 43.899997
+ ],
+ [
+ -76.426635,
+ 43.891234
+ ],
+ [
+ -76.429448,
+ 43.890235
+ ],
+ [
+ -76.434085,
+ 43.890945
+ ],
+ [
+ -76.439149,
+ 43.887812
+ ],
+ [
+ -76.444626,
+ 43.887505
+ ],
+ [
+ -76.445999,
+ 43.890255
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -79.762152,
+ 42.243054
+ ],
+ [
+ -79.761964,
+ 42.251354
+ ],
+ [
+ -79.7619513849551,
+ 42.2693120016754
+ ],
+ [
+ -79.761951,
+ 42.26986
+ ],
+ [
+ -79.7428073652415,
+ 42.2754628528496
+ ],
+ [
+ -79.738922,
+ 42.2766
+ ],
+ [
+ -79.7373282637567,
+ 42.2772127314153
+ ],
+ [
+ -79.717825,
+ 42.284711
+ ],
+ [
+ -79.7140604589544,
+ 42.286196985953005
+ ],
+ [
+ -79.7114516836397,
+ 42.287226753838496
+ ],
+ [
+ -79.6876589032746,
+ 42.2966185328037
+ ],
+ [
+ -79.683047,
+ 42.298439
+ ],
+ [
+ -79.6780756684084,
+ 42.3007066943597
+ ],
+ [
+ -79.66241781154719,
+ 42.3078490933397
+ ],
+ [
+ -79.645358,
+ 42.315631
+ ],
+ [
+ -79.6447351495852,
+ 42.3159464209945
+ ],
+ [
+ -79.6385319921047,
+ 42.319087794998595
+ ],
+ [
+ -79.6318794344462,
+ 42.322456752139395
+ ],
+ [
+ -79.6159658152648,
+ 42.33051565275
+ ],
+ [
+ -79.612468,
+ 42.332287
+ ],
+ [
+ -79.60735356437421,
+ 42.3373905505393
+ ],
+ [
+ -79.60707700483339,
+ 42.3376665214767
+ ],
+ [
+ -79.60589,
+ 42.338851
+ ],
+ [
+ -79.60417303770521,
+ 42.3394258447815
+ ],
+ [
+ -79.600448,
+ 42.340673
+ ],
+ [
+ -79.597227,
+ 42.34346
+ ],
+ [
+ -79.5965358974199,
+ 42.34323788589359
+ ],
+ [
+ -79.594632086953,
+ 42.3426260184622
+ ],
+ [
+ -79.592482,
+ 42.341935
+ ],
+ [
+ -79.587879,
+ 42.34306
+ ],
+ [
+ -79.569767,
+ 42.351197
+ ],
+ [
+ -79.5629575686757,
+ 42.3555220201486
+ ],
+ [
+ -79.55844663582148,
+ 42.3583871456714
+ ],
+ [
+ -79.552368,
+ 42.362248
+ ],
+ [
+ -79.546262,
+ 42.363417
+ ],
+ [
+ -79.5413,
+ 42.366085
+ ],
+ [
+ -79.538336,
+ 42.369079
+ ],
+ [
+ -79.531439,
+ 42.371142
+ ],
+ [
+ -79.5281362592994,
+ 42.37295672998079
+ ],
+ [
+ -79.5118351202862,
+ 42.3819135838095
+ ],
+ [
+ -79.510999,
+ 42.382373
+ ],
+ [
+ -79.4938989537134,
+ 42.392725128559896
+ ],
+ [
+ -79.490227941355,
+ 42.39494750803429
+ ],
+ [
+ -79.4796660678437,
+ 42.401341518353895
+ ],
+ [
+ -79.4787410152821,
+ 42.40190153222059
+ ],
+ [
+ -79.474794,
+ 42.404291
+ ],
+ [
+ -79.46271,
+ 42.407072
+ ],
+ [
+ -79.4580679703081,
+ 42.4091383279167
+ ],
+ [
+ -79.453533,
+ 42.411157
+ ],
+ [
+ -79.44827741451569,
+ 42.4148645837141
+ ],
+ [
+ -79.4403125149392,
+ 42.420483469001496
+ ],
+ [
+ -79.4315666123397,
+ 42.42665331746839
+ ],
+ [
+ -79.429119,
+ 42.42838
+ ],
+ [
+ -79.425718,
+ 42.431353
+ ],
+ [
+ -79.423012,
+ 42.437216
+ ],
+ [
+ -79.422515,
+ 42.440765
+ ],
+ [
+ -79.42196728458879,
+ 42.4422504509198
+ ],
+ [
+ -79.419983,
+ 42.447632
+ ],
+ [
+ -79.418508,
+ 42.452047
+ ],
+ [
+ -79.417732,
+ 42.453369
+ ],
+ [
+ -79.415273,
+ 42.453526
+ ],
+ [
+ -79.412686,
+ 42.451544
+ ],
+ [
+ -79.41160693217309,
+ 42.451590560837296
+ ],
+ [
+ -79.408723,
+ 42.451715
+ ],
+ [
+ -79.405458,
+ 42.453281
+ ],
+ [
+ -79.400742709648,
+ 42.4565409918282
+ ],
+ [
+ -79.39996584785989,
+ 42.457078087720795
+ ],
+ [
+ -79.393204,
+ 42.461753
+ ],
+ [
+ -79.38834398015949,
+ 42.4637978249715
+ ],
+ [
+ -79.38262980559202,
+ 42.4662020305572
+ ],
+ [
+ -79.381943,
+ 42.466491
+ ],
+ [
+ -79.36344203740089,
+ 42.4792875069125
+ ],
+ [
+ -79.36213,
+ 42.480195
+ ],
+ [
+ -79.360462,
+ 42.482386
+ ],
+ [
+ -79.359474,
+ 42.486063
+ ],
+ [
+ -79.356744,
+ 42.491466
+ ],
+ [
+ -79.354483,
+ 42.494071
+ ],
+ [
+ -79.352834,
+ 42.493838
+ ],
+ [
+ -79.3517,
+ 42.491999
+ ],
+ [
+ -79.347749,
+ 42.492156
+ ],
+ [
+ -79.345098,
+ 42.493057
+ ],
+ [
+ -79.34273,
+ 42.491063
+ ],
+ [
+ -79.341657,
+ 42.489377
+ ],
+ [
+ -79.3366090927732,
+ 42.4901365361339
+ ],
+ [
+ -79.336287,
+ 42.490185
+ ],
+ [
+ -79.33625193278039,
+ 42.4901886219984
+ ],
+ [
+ -79.331146,
+ 42.490716
+ ],
+ [
+ -79.329134,
+ 42.490026
+ ],
+ [
+ -79.3281439106354,
+ 42.490805807791894
+ ],
+ [
+ -79.32350533380729,
+ 42.4944592137198
+ ],
+ [
+ -79.323079,
+ 42.494795
+ ],
+ [
+ -79.3191481006186,
+ 42.499776438533196
+ ],
+ [
+ -79.318862,
+ 42.500139
+ ],
+ [
+ -79.317865,
+ 42.50234
+ ],
+ [
+ -79.310804,
+ 42.504159
+ ],
+ [
+ -79.309066934486,
+ 42.5039981101015
+ ],
+ [
+ -79.308256,
+ 42.503923
+ ],
+ [
+ -79.2992211224126,
+ 42.5065748417327
+ ],
+ [
+ -79.298161,
+ 42.506886
+ ],
+ [
+ -79.2944855628402,
+ 42.5096011792379
+ ],
+ [
+ -79.294299,
+ 42.509739
+ ],
+ [
+ -79.29393588250709,
+ 42.5097884450797
+ ],
+ [
+ -79.283364,
+ 42.511228
+ ],
+ [
+ -79.278033,
+ 42.51123
+ ],
+ [
+ -79.276987389768,
+ 42.5124775427312
+ ],
+ [
+ -79.2753228398345,
+ 42.5144635573156
+ ],
+ [
+ -79.271343,
+ 42.519212
+ ],
+ [
+ -79.264624,
+ 42.523159
+ ],
+ [
+ -79.261717,
+ 42.524309
+ ],
+ [
+ -79.258602,
+ 42.524437
+ ],
+ [
+ -79.253703,
+ 42.526719
+ ],
+ [
+ -79.249667,
+ 42.531744
+ ],
+ [
+ -79.246187,
+ 42.532559
+ ],
+ [
+ -79.2445895740124,
+ 42.533135576815305
+ ],
+ [
+ -79.244062,
+ 42.533326
+ ],
+ [
+ -79.241668,
+ 42.5312
+ ],
+ [
+ -79.2380163123659,
+ 42.53193396896219
+ ],
+ [
+ -79.236439,
+ 42.532251
+ ],
+ [
+ -79.231627,
+ 42.538045
+ ],
+ [
+ -79.230232,
+ 42.538128
+ ],
+ [
+ -79.2299112121535,
+ 42.537818567475504
+ ],
+ [
+ -79.227407,
+ 42.535403
+ ],
+ [
+ -79.2234032148227,
+ 42.535895284012
+ ],
+ [
+ -79.223129,
+ 42.535929
+ ],
+ [
+ -79.219128,
+ 42.538785
+ ],
+ [
+ -79.204504,
+ 42.542104
+ ],
+ [
+ -79.199409,
+ 42.54496
+ ],
+ [
+ -79.193232,
+ 42.545881
+ ],
+ [
+ -79.190734,
+ 42.545078
+ ],
+ [
+ -79.187059,
+ 42.546313
+ ],
+ [
+ -79.180109,
+ 42.552039
+ ],
+ [
+ -79.17948453697,
+ 42.5519072602116
+ ],
+ [
+ -79.17817013929789,
+ 42.551629968422
+ ],
+ [
+ -79.177829,
+ 42.551558
+ ],
+ [
+ -79.176306,
+ 42.548887
+ ],
+ [
+ -79.1761046015378,
+ 42.548914832976195
+ ],
+ [
+ -79.1719026151259,
+ 42.5494955414205
+ ],
+ [
+ -79.168701,
+ 42.549938
+ ],
+ [
+ -79.1652398267439,
+ 42.5515228994884
+ ],
+ [
+ -79.160861,
+ 42.553528
+ ],
+ [
+ -79.1605397879236,
+ 42.553447871268496
+ ],
+ [
+ -79.153489,
+ 42.551689
+ ],
+ [
+ -79.148723,
+ 42.553672
+ ],
+ [
+ -79.1487029624256,
+ 42.5536932926361
+ ],
+ [
+ -79.1419282384135,
+ 42.560892354295696
+ ],
+ [
+ -79.1413359517779,
+ 42.5615217390503
+ ],
+ [
+ -79.1404406703111,
+ 42.5624730968429
+ ],
+ [
+ -79.138569,
+ 42.564462
+ ],
+ [
+ -79.13689290760351,
+ 42.5697987744532
+ ],
+ [
+ -79.1329879240283,
+ 42.582232466430895
+ ],
+ [
+ -79.1319306369554,
+ 42.5855989291941
+ ],
+ [
+ -79.1318837649226,
+ 42.58574817243859
+ ],
+ [
+ -79.13057418829399,
+ 42.5899179396368
+ ],
+ [
+ -79.13049,
+ 42.590186
+ ],
+ [
+ -79.128463,
+ 42.591342
+ ],
+ [
+ -79.126261,
+ 42.590937
+ ],
+ [
+ -79.121921,
+ 42.594234
+ ],
+ [
+ -79.120473,
+ 42.59984
+ ],
+ [
+ -79.119703,
+ 42.602615
+ ],
+ [
+ -79.114747,
+ 42.603669
+ ],
+ [
+ -79.113713,
+ 42.605994
+ ],
+ [
+ -79.1122862397675,
+ 42.6104611183469
+ ],
+ [
+ -79.111361,
+ 42.613358
+ ],
+ [
+ -79.104929,
+ 42.617593
+ ],
+ [
+ -79.101289,
+ 42.620718
+ ],
+ [
+ -79.098208,
+ 42.621982
+ ],
+ [
+ -79.093285,
+ 42.629822
+ ],
+ [
+ -79.089323,
+ 42.629528
+ ],
+ [
+ -79.084917,
+ 42.631684
+ ],
+ [
+ -79.080962,
+ 42.637824
+ ],
+ [
+ -79.078761,
+ 42.640058
+ ],
+ [
+ -79.07649,
+ 42.640523
+ ],
+ [
+ -79.07472319895369,
+ 42.640213850854394
+ ],
+ [
+ -79.073261,
+ 42.639958
+ ],
+ [
+ -79.068731,
+ 42.641567
+ ],
+ [
+ -79.0644264378327,
+ 42.644330198124294
+ ],
+ [
+ -79.06376,
+ 42.644758
+ ],
+ [
+ -79.0637412475064,
+ 42.6452648007691
+ ],
+ [
+ -79.06370968742151,
+ 42.646117736687295
+ ],
+ [
+ -79.06321563733,
+ 42.6594698258638
+ ],
+ [
+ -79.0631249740441,
+ 42.6619200718991
+ ],
+ [
+ -79.063023,
+ 42.664676
+ ],
+ [
+ -79.062261,
+ 42.668358
+ ],
+ [
+ -79.06043,
+ 42.6712
+ ],
+ [
+ -79.05457994511978,
+ 42.6753276519625
+ ],
+ [
+ -79.054116,
+ 42.675655
+ ],
+ [
+ -79.052447,
+ 42.679943
+ ],
+ [
+ -79.0522450287341,
+ 42.6812384165437
+ ],
+ [
+ -79.051971,
+ 42.682996
+ ],
+ [
+ -79.04886,
+ 42.689158
+ ],
+ [
+ -79.046754,
+ 42.691346
+ ],
+ [
+ -79.042934,
+ 42.691415
+ ],
+ [
+ -79.030598,
+ 42.696613
+ ],
+ [
+ -79.027091,
+ 42.695982
+ ],
+ [
+ -79.021577,
+ 42.698243
+ ],
+ [
+ -79.019717,
+ 42.700613
+ ],
+ [
+ -79.015004,
+ 42.700554
+ ],
+ [
+ -79.00616,
+ 42.704558
+ ],
+ [
+ -79.001347,
+ 42.703725
+ ],
+ [
+ -78.991159,
+ 42.705358
+ ],
+ [
+ -78.9777846697016,
+ 42.711821709754005
+ ],
+ [
+ -78.977782,
+ 42.711823
+ ],
+ [
+ -78.97009255682079,
+ 42.7166909098867
+ ],
+ [
+ -78.969489,
+ 42.717073
+ ],
+ [
+ -78.967663,
+ 42.72047
+ ],
+ [
+ -78.964207,
+ 42.722159
+ ],
+ [
+ -78.963611210889,
+ 42.7221868899255
+ ],
+ [
+ -78.9613561063627,
+ 42.722292455294195
+ ],
+ [
+ -78.960255,
+ 42.722344
+ ],
+ [
+ -78.9518979201152,
+ 42.7273353006158
+ ],
+ [
+ -78.9450162279193,
+ 42.7314454198163
+ ],
+ [
+ -78.944158,
+ 42.731958
+ ],
+ [
+ -78.935527,
+ 42.732629
+ ],
+ [
+ -78.93109842165629,
+ 42.733809189358304
+ ],
+ [
+ -78.9208578454798,
+ 42.736538241006
+ ],
+ [
+ -78.91982425605269,
+ 42.7368136863403
+ ],
+ [
+ -78.918157,
+ 42.737258
+ ],
+ [
+ -78.91667885646,
+ 42.7382418948257
+ ],
+ [
+ -78.91644189661349,
+ 42.7383996221104
+ ],
+ [
+ -78.913982,
+ 42.740037
+ ],
+ [
+ -78.91323038939319,
+ 42.7407230329709
+ ],
+ [
+ -78.908194,
+ 42.74532
+ ],
+ [
+ -78.90343402409388,
+ 42.7473379729221
+ ],
+ [
+ -78.9031485857809,
+ 42.74745898336369
+ ],
+ [
+ -78.902264,
+ 42.747834
+ ],
+ [
+ -78.8980665902104,
+ 42.750626435973594
+ ],
+ [
+ -78.89711856256349,
+ 42.75125713600959
+ ],
+ [
+ -78.88432428575219,
+ 42.7597688612438
+ ],
+ [
+ -78.8839125234708,
+ 42.7600427968052
+ ],
+ [
+ -78.880452,
+ 42.762345
+ ],
+ [
+ -78.879378873546,
+ 42.763560174216295
+ ],
+ [
+ -78.877551,
+ 42.76563
+ ],
+ [
+ -78.874334,
+ 42.766144
+ ],
+ [
+ -78.8686995062207,
+ 42.7701558219813
+ ],
+ [
+ -78.868556,
+ 42.770258
+ ],
+ [
+ -78.865698,
+ 42.771737
+ ],
+ [
+ -78.863063,
+ 42.775063
+ ],
+ [
+ -78.859731,
+ 42.779569
+ ],
+ [
+ -78.853455,
+ 42.783958
+ ],
+ [
+ -78.853481545061,
+ 42.7860755907631
+ ],
+ [
+ -78.85356904042659,
+ 42.79305539684609
+ ],
+ [
+ -78.853583,
+ 42.794169
+ ],
+ [
+ -78.856456,
+ 42.800258
+ ],
+ [
+ -78.859356,
+ 42.800658
+ ],
+ [
+ -78.86214625077409,
+ 42.8053754102793
+ ],
+ [
+ -78.868408,
+ 42.815962
+ ],
+ [
+ -78.871805,
+ 42.822679
+ ],
+ [
+ -78.871932,
+ 42.826183
+ ],
+ [
+ -78.87118318650471,
+ 42.8282421009642
+ ],
+ [
+ -78.8703892509609,
+ 42.8304252793578
+ ],
+ [
+ -78.87025311040838,
+ 42.8307996411242
+ ],
+ [
+ -78.8697065385628,
+ 42.8323026143228
+ ],
+ [
+ -78.869182,
+ 42.833745
+ ],
+ [
+ -78.86622939076749,
+ 42.834206292389005
+ ],
+ [
+ -78.86217604809319,
+ 42.834839554693
+ ],
+ [
+ -78.860445,
+ 42.83511
+ ],
+ [
+ -78.860905,
+ 42.838003
+ ],
+ [
+ -78.859456,
+ 42.841358
+ ],
+ [
+ -78.865592,
+ 42.852358
+ ],
+ [
+ -78.872031,
+ 42.852113
+ ],
+ [
+ -78.882557,
+ 42.867258
+ ],
+ [
+ -78.890108,
+ 42.876669
+ ],
+ [
+ -78.8887141622712,
+ 42.878047976731196
+ ],
+ [
+ -78.887857,
+ 42.878896
+ ],
+ [
+ -78.891655,
+ 42.884845
+ ],
+ [
+ -78.90264327633639,
+ 42.8958782353034
+ ],
+ [
+ -78.906075,
+ 42.899324
+ ],
+ [
+ -78.90594308382069,
+ 42.9069450133096
+ ],
+ [
+ -78.90583726473739,
+ 42.913058354726004
+ ],
+ [
+ -78.9056972647797,
+ 42.9211463811257
+ ],
+ [
+ -78.905659,
+ 42.923357
+ ],
+ [
+ -78.909159,
+ 42.933257
+ ],
+ [
+ -78.9123653357821,
+ 42.937752481096595
+ ],
+ [
+ -78.91424134868728,
+ 42.9403827672317
+ ],
+ [
+ -78.918859,
+ 42.946857
+ ],
+ [
+ -78.93236,
+ 42.955857
+ ],
+ [
+ -78.961761,
+ 42.957756
+ ],
+ [
+ -78.975062,
+ 42.968756
+ ],
+ [
+ -78.98325707809339,
+ 42.9724605228498
+ ],
+ [
+ -79.011563,
+ 42.985256
+ ],
+ [
+ -79.019964,
+ 42.994756
+ ],
+ [
+ -79.023256,
+ 43.016356
+ ],
+ [
+ -79.011764,
+ 43.028956
+ ],
+ [
+ -79.005164,
+ 43.047056
+ ],
+ [
+ -78.999435,
+ 43.056057
+ ],
+ [
+ -79.00713,
+ 43.065757
+ ],
+ [
+ -79.0192327742718,
+ 43.067931426587805
+ ],
+ [
+ -79.0397719364891,
+ 43.0716215640234
+ ],
+ [
+ -79.04563530157901,
+ 43.0726749966215
+ ],
+ [
+ -79.074467,
+ 43.077855
+ ],
+ [
+ -79.075367,
+ 43.081355
+ ],
+ [
+ -79.067222,
+ 43.090036
+ ],
+ [
+ -79.064754,
+ 43.093205
+ ],
+ [
+ -79.0634411118669,
+ 43.0958628592089
+ ],
+ [
+ -79.057961,
+ 43.106957
+ ],
+ [
+ -79.0586163430622,
+ 43.109174269251895
+ ],
+ [
+ -79.059693,
+ 43.112817
+ ],
+ [
+ -79.061967,
+ 43.115355
+ ],
+ [
+ -79.069091,
+ 43.119956
+ ],
+ [
+ -79.061109,
+ 43.125371
+ ],
+ [
+ -79.056767,
+ 43.126855
+ ],
+ [
+ -79.05210115348869,
+ 43.132096087862
+ ],
+ [
+ -79.049467,
+ 43.135055
+ ],
+ [
+ -79.044066,
+ 43.138055
+ ],
+ [
+ -79.042366,
+ 43.143655
+ ],
+ [
+ -79.042867,
+ 43.149155
+ ],
+ [
+ -79.0444932963404,
+ 43.153077244114996
+ ],
+ [
+ -79.044567,
+ 43.153255
+ ],
+ [
+ -79.046567,
+ 43.162355
+ ],
+ [
+ -79.04837609887639,
+ 43.1645449617977
+ ],
+ [
+ -79.048467,
+ 43.164655
+ ],
+ [
+ -79.0526159334377,
+ 43.17277247846509
+ ],
+ [
+ -79.053067,
+ 43.173655
+ ],
+ [
+ -79.0527599066339,
+ 43.1797968673219
+ ],
+ [
+ -79.052567,
+ 43.183655
+ ],
+ [
+ -79.0503212126752,
+ 43.1928472735217
+ ],
+ [
+ -79.048658,
+ 43.199655
+ ],
+ [
+ -79.057058,
+ 43.210654
+ ],
+ [
+ -79.0541976937107,
+ 43.218436217589094
+ ],
+ [
+ -79.052868,
+ 43.222054
+ ],
+ [
+ -79.055538048,
+ 43.236739264
+ ],
+ [
+ -79.055868,
+ 43.238554
+ ],
+ [
+ -79.05605337910148,
+ 43.2536179830286
+ ],
+ [
+ -79.05606,
+ 43.254156
+ ],
+ [
+ -79.070469,
+ 43.262454
+ ],
+ [
+ -79.06467,
+ 43.262754
+ ],
+ [
+ -79.063169,
+ 43.263654
+ ],
+ [
+ -79.02104633089989,
+ 43.2734084981974
+ ],
+ [
+ -79.019848,
+ 43.273686
+ ],
+ [
+ -79.0178884660885,
+ 43.273995054936
+ ],
+ [
+ -78.998633,
+ 43.277032
+ ],
+ [
+ -78.988009,
+ 43.27781
+ ],
+ [
+ -78.971866,
+ 43.281254
+ ],
+ [
+ -78.95855871738179,
+ 43.284555825450695
+ ],
+ [
+ -78.955628,
+ 43.285283
+ ],
+ [
+ -78.930764,
+ 43.293254
+ ],
+ [
+ -78.908036,
+ 43.298889
+ ],
+ [
+ -78.901936,
+ 43.299873
+ ],
+ [
+ -78.9008249216423,
+ 43.300137363922296
+ ],
+ [
+ -78.883267,
+ 43.304315
+ ],
+ [
+ -78.859737,
+ 43.310511
+ ],
+ [
+ -78.851389,
+ 43.312215
+ ],
+ [
+ -78.836261,
+ 43.318455
+ ],
+ [
+ -78.83597997474429,
+ 43.3183400351227
+ ],
+ [
+ -78.834061,
+ 43.317555
+ ],
+ [
+ -78.82036720319239,
+ 43.3198654360422
+ ],
+ [
+ -78.815729,
+ 43.320648
+ ],
+ [
+ -78.808072,
+ 43.323129
+ ],
+ [
+ -78.806185153299,
+ 43.323372546337005
+ ],
+ [
+ -78.77403,
+ 43.327523
+ ],
+ [
+ -78.754355,
+ 43.3326716528729
+ ],
+ [
+ -78.747158,
+ 43.334555
+ ],
+ [
+ -78.7468798525792,
+ 43.3346235224172
+ ],
+ [
+ -78.728993,
+ 43.33903
+ ],
+ [
+ -78.724686,
+ 43.339328
+ ],
+ [
+ -78.719142,
+ 43.339537
+ ],
+ [
+ -78.715202,
+ 43.339007
+ ],
+ [
+ -78.696856,
+ 43.341255
+ ],
+ [
+ -78.69516303738469,
+ 43.3416171488079
+ ],
+ [
+ -78.6882314572871,
+ 43.343099912483005
+ ],
+ [
+ -78.686665,
+ 43.343435
+ ],
+ [
+ -78.6562684773113,
+ 43.3516788103436
+ ],
+ [
+ -78.649841,
+ 43.353422
+ ],
+ [
+ -78.643589,
+ 43.35583
+ ],
+ [
+ -78.63465679221679,
+ 43.35756367746
+ ],
+ [
+ -78.634346,
+ 43.357624
+ ],
+ [
+ -78.599077,
+ 43.36139
+ ],
+ [
+ -78.5526752268935,
+ 43.3687082317362
+ ],
+ [
+ -78.547395,
+ 43.369541
+ ],
+ [
+ -78.5361599936191,
+ 43.3706945670123
+ ],
+ [
+ -78.51993,
+ 43.372361
+ ],
+ [
+ -78.511269,
+ 43.371796
+ ],
+ [
+ -78.506857,
+ 43.372281
+ ],
+ [
+ -78.4922600999256,
+ 43.3742937503325
+ ],
+ [
+ -78.488857,
+ 43.374763
+ ],
+ [
+ -78.485857,
+ 43.374884
+ ],
+ [
+ -78.482526,
+ 43.374425
+ ],
+ [
+ -78.477841,
+ 43.371674
+ ],
+ [
+ -78.473099,
+ 43.370812
+ ],
+ [
+ -78.4655020828508,
+ 43.3712326509368
+ ],
+ [
+ -78.461342,
+ 43.371463
+ ],
+ [
+ -78.451877,
+ 43.372679
+ ],
+ [
+ -78.447572,
+ 43.372038
+ ],
+ [
+ -78.4352889082449,
+ 43.372747237338096
+ ],
+ [
+ -78.428989,
+ 43.373111
+ ],
+ [
+ -78.414123,
+ 43.375
+ ],
+ [
+ -78.402718,
+ 43.374808
+ ],
+ [
+ -78.3887583459876,
+ 43.3755369759934
+ ],
+ [
+ -78.370221,
+ 43.376505
+ ],
+ [
+ -78.366934,
+ 43.375786
+ ],
+ [
+ -78.36485,
+ 43.37413
+ ],
+ [
+ -78.358711,
+ 43.373988
+ ],
+ [
+ -78.34933739519559,
+ 43.373716974422
+ ],
+ [
+ -78.342767,
+ 43.373527
+ ],
+ [
+ -78.337107,
+ 43.372623
+ ],
+ [
+ -78.319783,
+ 43.372925
+ ],
+ [
+ -78.31114,
+ 43.373656
+ ],
+ [
+ -78.3090679526025,
+ 43.373344034603
+ ],
+ [
+ -78.307115,
+ 43.37305
+ ],
+ [
+ -78.3024,
+ 43.371505
+ ],
+ [
+ -78.2885454883388,
+ 43.371824832875596
+ ],
+ [
+ -78.2836,
+ 43.371939
+ ],
+ [
+ -78.28212579737529,
+ 43.3718910405241
+ ],
+ [
+ -78.27326089219329,
+ 43.3716026431227
+ ],
+ [
+ -78.272903,
+ 43.371591
+ ],
+ [
+ -78.267602,
+ 43.372644
+ ],
+ [
+ -78.2660330971782,
+ 43.3725734850907
+ ],
+ [
+ -78.253051,
+ 43.37199
+ ],
+ [
+ -78.2523169178087,
+ 43.3716476313763
+ ],
+ [
+ -78.250641,
+ 43.370866
+ ],
+ [
+ -78.24666,
+ 43.369257
+ ],
+ [
+ -78.2431504508385,
+ 43.3692067137619
+ ],
+ [
+ -78.233609,
+ 43.36907
+ ],
+ [
+ -78.23048015477501,
+ 43.36929788725109
+ ],
+ [
+ -78.222227,
+ 43.369899
+ ],
+ [
+ -78.20992784449909,
+ 43.3716411843914
+ ],
+ [
+ -78.209675,
+ 43.371677
+ ],
+ [
+ -78.205563,
+ 43.371495
+ ],
+ [
+ -78.200227,
+ 43.37069
+ ],
+ [
+ -78.192787,
+ 43.371342
+ ],
+ [
+ -78.18945,
+ 43.371634
+ ],
+ [
+ -78.186012,
+ 43.370384
+ ],
+ [
+ -78.178748,
+ 43.370702
+ ],
+ [
+ -78.17478915275869,
+ 43.3715577457294
+ ],
+ [
+ -78.17020551587079,
+ 43.372548546195596
+ ],
+ [
+ -78.159887,
+ 43.374779
+ ],
+ [
+ -78.158957939898,
+ 43.374825225356304
+ ],
+ [
+ -78.1550977580285,
+ 43.3750172885844
+ ],
+ [
+ -78.14520583736659,
+ 43.3755094607872
+ ],
+ [
+ -78.145195,
+ 43.37551
+ ],
+ [
+ -78.1196865500489,
+ 43.3755839811506
+ ],
+ [
+ -78.1153635496544,
+ 43.375596518978
+ ],
+ [
+ -78.104509,
+ 43.375628
+ ],
+ [
+ -78.0942229876912,
+ 43.3744769199995
+ ],
+ [
+ -78.08146124852219,
+ 43.3730487880579
+ ],
+ [
+ -78.07565105477059,
+ 43.3723985848863
+ ],
+ [
+ -78.074645,
+ 43.372286
+ ],
+ [
+ -78.071854,
+ 43.371336
+ ],
+ [
+ -78.0583296264522,
+ 43.370001203132496
+ ],
+ [
+ -78.058054,
+ 43.369974
+ ],
+ [
+ -78.039252,
+ 43.370887
+ ],
+ [
+ -78.032829,
+ 43.367027
+ ],
+ [
+ -78.023609,
+ 43.366575
+ ],
+ [
+ -78.015046,
+ 43.367285
+ ],
+ [
+ -78.011528,
+ 43.36809
+ ],
+ [
+ -78.004801,
+ 43.368161
+ ],
+ [
+ -77.999792,
+ 43.365127
+ ],
+ [
+ -77.99559629134319,
+ 43.3652387952246
+ ],
+ [
+ -77.994838,
+ 43.365259
+ ],
+ [
+ -77.981369,
+ 43.36718
+ ],
+ [
+ -77.976438,
+ 43.369159
+ ],
+ [
+ -77.969666,
+ 43.367182
+ ],
+ [
+ -77.965238,
+ 43.368059
+ ],
+ [
+ -77.949879,
+ 43.363744
+ ],
+ [
+ -77.933246,
+ 43.359587
+ ],
+ [
+ -77.928725,
+ 43.357523
+ ],
+ [
+ -77.922736,
+ 43.35696
+ ],
+ [
+ -77.921739,
+ 43.35696
+ ],
+ [
+ -77.904836,
+ 43.35696
+ ],
+ [
+ -77.900917,
+ 43.354758
+ ],
+ [
+ -77.89655844227809,
+ 43.353701619651304
+ ],
+ [
+ -77.89193561509929,
+ 43.352581188513604
+ ],
+ [
+ -77.888795,
+ 43.35182
+ ],
+ [
+ -77.875335,
+ 43.34966
+ ],
+ [
+ -77.848146,
+ 43.34684
+ ],
+ [
+ -77.844256,
+ 43.347545
+ ],
+ [
+ -77.832295,
+ 43.344956
+ ],
+ [
+ -77.826999,
+ 43.342833
+ ],
+ [
+ -77.816533,
+ 43.34356
+ ],
+ [
+ -77.8088692218046,
+ 43.342078224172
+ ],
+ [
+ -77.797381,
+ 43.339857
+ ],
+ [
+ -77.785132,
+ 43.339261
+ ],
+ [
+ -77.777813,
+ 43.339566
+ ],
+ [
+ -77.7744281095367,
+ 43.340054152318295
+ ],
+ [
+ -77.766767,
+ 43.341159
+ ],
+ [
+ -77.760231,
+ 43.341161
+ ],
+ [
+ -77.756931,
+ 43.337361
+ ],
+ [
+ -77.7484476069107,
+ 43.335038638483596
+ ],
+ [
+ -77.73063,
+ 43.330161
+ ],
+ [
+ -77.72803,
+ 43.327561
+ ],
+ [
+ -77.714129,
+ 43.323561
+ ],
+ [
+ -77.712423,
+ 43.321505
+ ],
+ [
+ -77.713625,
+ 43.317936
+ ],
+ [
+ -77.707683,
+ 43.310846
+ ],
+ [
+ -77.701429,
+ 43.308261
+ ],
+ [
+ -77.6993320403389,
+ 43.3071252060802
+ ],
+ [
+ -77.6834847936743,
+ 43.2985417284192
+ ],
+ [
+ -77.682252,
+ 43.297874
+ ],
+ [
+ -77.67499106325901,
+ 43.2929402908254
+ ],
+ [
+ -77.660359,
+ 43.282998
+ ],
+ [
+ -77.653759,
+ 43.279484
+ ],
+ [
+ -77.64434391470759,
+ 43.2764567710746
+ ],
+ [
+ -77.628315,
+ 43.271303
+ ],
+ [
+ -77.62216716906501,
+ 43.267928984901395
+ ],
+ [
+ -77.60367285296991,
+ 43.2577790470773
+ ],
+ [
+ -77.6021611595269,
+ 43.2569494086968
+ ],
+ [
+ -77.5965313382608,
+ 43.253859684507006
+ ],
+ [
+ -77.5922575729939,
+ 43.2515141827047
+ ],
+ [
+ -77.57725157523839,
+ 43.243278682488196
+ ],
+ [
+ -77.577223,
+ 43.243263
+ ],
+ [
+ -77.565075,
+ 43.238165
+ ],
+ [
+ -77.551022,
+ 43.235763
+ ],
+ [
+ -77.5503215912768,
+ 43.2357219790254
+ ],
+ [
+ -77.539548,
+ 43.235091
+ ],
+ [
+ -77.534415,
+ 43.235914
+ ],
+ [
+ -77.53397782018969,
+ 43.2359220179699
+ ],
+ [
+ -77.530053,
+ 43.235994
+ ],
+ [
+ -77.521426,
+ 43.238504
+ ],
+ [
+ -77.516365,
+ 43.240753
+ ],
+ [
+ -77.514321,
+ 43.244001
+ ],
+ [
+ -77.508863,
+ 43.247037
+ ],
+ [
+ -77.5073246091302,
+ 43.2476811757564
+ ],
+ [
+ -77.50092,
+ 43.250363
+ ],
+ [
+ -77.486879,
+ 43.250458
+ ],
+ [
+ -77.476642,
+ 43.254522
+ ],
+ [
+ -77.469712,
+ 43.257061
+ ],
+ [
+ -77.46478927969889,
+ 43.258354521955695
+ ],
+ [
+ -77.45428,
+ 43.261116
+ ],
+ [
+ -77.4514677876888,
+ 43.2613069602683
+ ],
+ [
+ -77.4497,
+ 43.261427
+ ],
+ [
+ -77.44202,
+ 43.262909
+ ],
+ [
+ -77.436831,
+ 43.265701
+ ],
+ [
+ -77.43409340216789,
+ 43.2672653416183
+ ],
+ [
+ -77.432365,
+ 43.268253
+ ],
+ [
+ -77.425457,
+ 43.270162
+ ],
+ [
+ -77.414516,
+ 43.269263
+ ],
+ [
+ -77.406467,
+ 43.270828
+ ],
+ [
+ -77.391015,
+ 43.276363
+ ],
+ [
+ -77.38874,
+ 43.276559
+ ],
+ [
+ -77.388435,
+ 43.275497
+ ],
+ [
+ -77.38306,
+ 43.275334
+ ],
+ [
+ -77.376046,
+ 43.2762243589198
+ ],
+ [
+ -77.368951,
+ 43.277125
+ ],
+ [
+ -77.366071,
+ 43.277909
+ ],
+ [
+ -77.359637,
+ 43.278618
+ ],
+ [
+ -77.355085,
+ 43.278131
+ ],
+ [
+ -77.349475,
+ 43.278722
+ ],
+ [
+ -77.341092,
+ 43.280661
+ ],
+ [
+ -77.337747,
+ 43.279829
+ ],
+ [
+ -77.33525,
+ 43.277862
+ ],
+ [
+ -77.328846,
+ 43.278954
+ ],
+ [
+ -77.322052,
+ 43.280619
+ ],
+ [
+ -77.321457741772,
+ 43.2806518588903
+ ],
+ [
+ -77.314619,
+ 43.28103
+ ],
+ [
+ -77.3135306812468,
+ 43.280971759610104
+ ],
+ [
+ -77.311816,
+ 43.28088
+ ],
+ [
+ -77.31052,
+ 43.278669
+ ],
+ [
+ -77.303979,
+ 43.27815
+ ],
+ [
+ -77.29602322728459,
+ 43.2779927601422
+ ],
+ [
+ -77.292696,
+ 43.277927
+ ],
+ [
+ -77.286587,
+ 43.278628
+ ],
+ [
+ -77.281038,
+ 43.277274
+ ],
+ [
+ -77.264177,
+ 43.277363
+ ],
+ [
+ -77.26281454025069,
+ 43.2775465225317
+ ],
+ [
+ -77.2557222287158,
+ 43.2785018527492
+ ],
+ [
+ -77.2524216632045,
+ 43.2789464369941
+ ],
+ [
+ -77.2500649945595,
+ 43.2792638788828
+ ],
+ [
+ -77.23613883200629,
+ 43.281139724837395
+ ],
+ [
+ -77.219106657079,
+ 43.2834339488429
+ ],
+ [
+ -77.214058,
+ 43.284114
+ ],
+ [
+ -77.2079084988633,
+ 43.283723476215
+ ],
+ [
+ -77.207901,
+ 43.283723
+ ],
+ [
+ -77.205228,
+ 43.282995
+ ],
+ [
+ -77.19668455956219,
+ 43.2825999603868
+ ],
+ [
+ -77.196256533466,
+ 43.2825801689147
+ ],
+ [
+ -77.196188,
+ 43.282577
+ ],
+ [
+ -77.190746,
+ 43.285184
+ ],
+ [
+ -77.185574,
+ 43.284108
+ ],
+ [
+ -77.1855342862082,
+ 43.284066275383296
+ ],
+ [
+ -77.18344547550939,
+ 43.28187170211739
+ ],
+ [
+ -77.183362,
+ 43.281784
+ ],
+ [
+ -77.1820355532859,
+ 43.2817484955376
+ ],
+ [
+ -77.173088,
+ 43.281509
+ ],
+ [
+ -77.17021261663439,
+ 43.2822845225315
+ ],
+ [
+ -77.1670685491141,
+ 43.28313251213589
+ ],
+ [
+ -77.156029,
+ 43.28611
+ ],
+ [
+ -77.149641,
+ 43.289229
+ ],
+ [
+ -77.143479,
+ 43.28954
+ ],
+ [
+ -77.143416,
+ 43.287561
+ ],
+ [
+ -77.136398,
+ 43.285554
+ ],
+ [
+ -77.1321951773717,
+ 43.285611032774796
+ ],
+ [
+ -77.130429,
+ 43.285635
+ ],
+ [
+ -77.120656,
+ 43.287492
+ ],
+ [
+ -77.116758,
+ 43.286344
+ ],
+ [
+ -77.114214,
+ 43.286562
+ ],
+ [
+ -77.111592,
+ 43.288008
+ ],
+ [
+ -77.107542,
+ 43.28957
+ ],
+ [
+ -77.1047514873158,
+ 43.2889711449264
+ ],
+ [
+ -77.103502,
+ 43.288703
+ ],
+ [
+ -77.098031,
+ 43.286774
+ ],
+ [
+ -77.095179,
+ 43.284859
+ ],
+ [
+ -77.083153,
+ 43.283168
+ ],
+ [
+ -77.080829,
+ 43.281719
+ ],
+ [
+ -77.075458,
+ 43.281409
+ ],
+ [
+ -77.069751,
+ 43.283341
+ ],
+ [
+ -77.067295,
+ 43.280937
+ ],
+ [
+ -77.064289,
+ 43.279455
+ ],
+ [
+ -77.060297,
+ 43.279412
+ ],
+ [
+ -77.055002,
+ 43.276669
+ ],
+ [
+ -77.048691,
+ 43.277092
+ ],
+ [
+ -77.046879,
+ 43.276131
+ ],
+ [
+ -77.045232,
+ 43.273
+ ],
+ [
+ -77.042201,
+ 43.270845
+ ],
+ [
+ -77.033875,
+ 43.271218
+ ],
+ [
+ -77.0269123408423,
+ 43.2712664762719
+ ],
+ [
+ -77.0087374621963,
+ 43.27139301562119
+ ],
+ [
+ -77.00680251843659,
+ 43.2714064873219
+ ],
+ [
+ -76.999691,
+ 43.271456
+ ],
+ [
+ -76.988445,
+ 43.2745
+ ],
+ [
+ -76.9852864569646,
+ 43.274027529269894
+ ],
+ [
+ -76.983264,
+ 43.273725
+ ],
+ [
+ -76.9760165080694,
+ 43.2742210260637
+ ],
+ [
+ -76.974848,
+ 43.274301
+ ],
+ [
+ -76.9741812914477,
+ 43.2741482494898
+ ],
+ [
+ -76.96758684521039,
+ 43.2726373868738
+ ],
+ [
+ -76.965429,
+ 43.272143
+ ],
+ [
+ -76.963139,
+ 43.270454
+ ],
+ [
+ -76.958402,
+ 43.270005
+ ],
+ [
+ -76.952412,
+ 43.270313
+ ],
+ [
+ -76.944536,
+ 43.272965
+ ],
+ [
+ -76.939532,
+ 43.276327
+ ],
+ [
+ -76.931982,
+ 43.279659
+ ],
+ [
+ -76.924391,
+ 43.28525
+ ],
+ [
+ -76.920465,
+ 43.284792
+ ],
+ [
+ -76.9068426137259,
+ 43.2907067951529
+ ],
+ [
+ -76.904288,
+ 43.291816
+ ],
+ [
+ -76.896207,
+ 43.295957
+ ],
+ [
+ -76.886913,
+ 43.293891
+ ],
+ [
+ -76.8820122786271,
+ 43.2933940268889
+ ],
+ [
+ -76.877397,
+ 43.292926
+ ],
+ [
+ -76.873053,
+ 43.294131
+ ],
+ [
+ -76.866522,
+ 43.294585
+ ],
+ [
+ -76.8574128885783,
+ 43.297628733922096
+ ],
+ [
+ -76.854976,
+ 43.298443
+ ],
+ [
+ -76.8451867362714,
+ 43.3035624736107
+ ],
+ [
+ -76.841675,
+ 43.305399
+ ],
+ [
+ -76.834889,
+ 43.305162
+ ],
+ [
+ -76.8322675624879,
+ 43.305714169319494
+ ],
+ [
+ -76.831053,
+ 43.30597
+ ],
+ [
+ -76.826182,
+ 43.304659
+ ],
+ [
+ -76.818945,
+ 43.305912
+ ],
+ [
+ -76.809131,
+ 43.30831
+ ],
+ [
+ -76.804302,
+ 43.307965
+ ],
+ [
+ -76.794708,
+ 43.309632
+ ],
+ [
+ -76.787949,
+ 43.311309
+ ],
+ [
+ -76.7813007344908,
+ 43.3138184356654
+ ],
+ [
+ -76.77225729502409,
+ 43.3172319469796
+ ],
+ [
+ -76.769025,
+ 43.318452
+ ],
+ [
+ -76.76302971810381,
+ 43.321565451264696
+ ],
+ [
+ -76.761881,
+ 43.322162
+ ],
+ [
+ -76.755784,
+ 43.325419
+ ],
+ [
+ -76.7511225333699,
+ 43.3286585508598
+ ],
+ [
+ -76.747067,
+ 43.331477
+ ],
+ [
+ -76.73733459660978,
+ 43.3377336164607
+ ],
+ [
+ -76.737334,
+ 43.337734
+ ],
+ [
+ -76.73732926984161,
+ 43.337738273297894
+ ],
+ [
+ -76.731039,
+ 43.343421
+ ],
+ [
+ -76.72904951983341,
+ 43.34348281693389
+ ],
+ [
+ -76.72250131286259,
+ 43.3436862821829
+ ],
+ [
+ -76.7214915934121,
+ 43.3437176560873
+ ],
+ [
+ -76.71823,
+ 43.343819
+ ],
+ [
+ -76.7154585235064,
+ 43.3446937370187
+ ],
+ [
+ -76.7101515179718,
+ 43.346368741014096
+ ],
+ [
+ -76.70978,
+ 43.346486
+ ],
+ [
+ -76.7087765925423,
+ 43.346200301825796
+ ],
+ [
+ -76.7073974535803,
+ 43.3458076223809
+ ],
+ [
+ -76.702538,
+ 43.344424
+ ],
+ [
+ -76.6993932834817,
+ 43.344433032215896
+ ],
+ [
+ -76.69836,
+ 43.344436
+ ],
+ [
+ -76.694026,
+ 43.346461
+ ],
+ [
+ -76.6910528176292,
+ 43.348480948328294
+ ],
+ [
+ -76.684856,
+ 43.352691
+ ],
+ [
+ -76.6808611878118,
+ 43.356319428743596
+ ],
+ [
+ -76.6753087390872,
+ 43.3613626356834
+ ],
+ [
+ -76.669624,
+ 43.366526
+ ],
+ [
+ -76.6637171992459,
+ 43.3741349974823
+ ],
+ [
+ -76.6573148418806,
+ 43.382382358973096
+ ],
+ [
+ -76.655695,
+ 43.384469
+ ],
+ [
+ -76.651038,
+ 43.388819
+ ],
+ [
+ -76.642672,
+ 43.401241
+ ],
+ [
+ -76.6385607899334,
+ 43.405427191793294
+ ],
+ [
+ -76.6374388478073,
+ 43.4065695963031
+ ],
+ [
+ -76.6358703571203,
+ 43.4081666936869
+ ],
+ [
+ -76.6355501782998,
+ 43.408492712043795
+ ],
+ [
+ -76.63156185574759,
+ 43.4125537750561
+ ],
+ [
+ -76.630774,
+ 43.413356
+ ],
+ [
+ -76.626023,
+ 43.412478
+ ],
+ [
+ -76.62202,
+ 43.413709
+ ],
+ [
+ -76.617684,
+ 43.417633
+ ],
+ [
+ -76.61692529756529,
+ 43.4180442652892
+ ],
+ [
+ -76.607093,
+ 43.423374
+ ],
+ [
+ -76.60177,
+ 43.423524
+ ],
+ [
+ -76.598907,
+ 43.424365
+ ],
+ [
+ -76.594959,
+ 43.430272
+ ],
+ [
+ -76.590538,
+ 43.4315
+ ],
+ [
+ -76.586571,
+ 43.43339
+ ],
+ [
+ -76.583987,
+ 43.436022
+ ],
+ [
+ -76.57498,
+ 43.441349
+ ],
+ [
+ -76.570036,
+ 43.442558
+ ],
+ [
+ -76.567058,
+ 43.444731
+ ],
+ [
+ -76.564958,
+ 43.448886
+ ],
+ [
+ -76.562404,
+ 43.448293
+ ],
+ [
+ -76.5573438314961,
+ 43.450034219422896
+ ],
+ [
+ -76.552933,
+ 43.451552
+ ],
+ [
+ -76.5508907569937,
+ 43.4518162469936
+ ],
+ [
+ -76.549602,
+ 43.451983
+ ],
+ [
+ -76.5475412894848,
+ 43.4541039478129
+ ],
+ [
+ -76.546831,
+ 43.454835
+ ],
+ [
+ -76.5430384833319,
+ 43.456214556026495
+ ],
+ [
+ -76.5375360736394,
+ 43.4582160983047
+ ],
+ [
+ -76.53737978167081,
+ 43.4582729506658
+ ],
+ [
+ -76.53181,
+ 43.460299
+ ],
+ [
+ -76.526321,
+ 43.460925
+ ],
+ [
+ -76.5262464062783,
+ 43.4609631251923
+ ],
+ [
+ -76.5196361332275,
+ 43.464341665985295
+ ],
+ [
+ -76.519522,
+ 43.4644
+ ],
+ [
+ -76.51616,
+ 43.465662
+ ],
+ [
+ -76.51347040626369,
+ 43.4660707647125
+ ],
+ [
+ -76.511337,
+ 43.466395
+ ],
+ [
+ -76.50889,
+ 43.467349
+ ],
+ [
+ -76.506858,
+ 43.469127
+ ],
+ [
+ -76.498369,
+ 43.470438
+ ],
+ [
+ -76.495053,
+ 43.47242
+ ],
+ [
+ -76.491703,
+ 43.474889
+ ],
+ [
+ -76.486962,
+ 43.47535
+ ],
+ [
+ -76.4810037041061,
+ 43.4815688205727
+ ],
+ [
+ -76.477082,
+ 43.485662
+ ],
+ [
+ -76.472498,
+ 43.492781
+ ],
+ [
+ -76.469724,
+ 43.495521
+ ],
+ [
+ -76.450091,
+ 43.503856
+ ],
+ [
+ -76.447505,
+ 43.50303
+ ],
+ [
+ -76.44643,
+ 43.505411
+ ],
+ [
+ -76.437473,
+ 43.509213
+ ],
+ [
+ -76.433809,
+ 43.512389
+ ],
+ [
+ -76.428253,
+ 43.513201
+ ],
+ [
+ -76.422219,
+ 43.515978
+ ],
+ [
+ -76.417581,
+ 43.521285
+ ],
+ [
+ -76.410636,
+ 43.523159
+ ],
+ [
+ -76.40107892899601,
+ 43.52399933387709
+ ],
+ [
+ -76.386423,
+ 43.525288
+ ],
+ [
+ -76.383576,
+ 43.525375
+ ],
+ [
+ -76.383127,
+ 43.523582
+ ],
+ [
+ -76.37097223140401,
+ 43.525488897440496
+ ],
+ [
+ -76.368849,
+ 43.525822
+ ],
+ [
+ -76.363604,
+ 43.524404
+ ],
+ [
+ -76.356927,
+ 43.519115
+ ],
+ [
+ -76.352527,
+ 43.516158
+ ],
+ [
+ -76.345492,
+ 43.513437
+ ],
+ [
+ -76.337815,
+ 43.514387
+ ],
+ [
+ -76.334317,
+ 43.514381
+ ],
+ [
+ -76.330911,
+ 43.511978
+ ],
+ [
+ -76.318683,
+ 43.514407
+ ],
+ [
+ -76.315831,
+ 43.514752
+ ],
+ [
+ -76.309673,
+ 43.515038
+ ],
+ [
+ -76.304422,
+ 43.512677
+ ],
+ [
+ -76.300312,
+ 43.513678
+ ],
+ [
+ -76.297103,
+ 43.51287
+ ],
+ [
+ -76.291258,
+ 43.513783
+ ],
+ [
+ -76.283744,
+ 43.516475
+ ],
+ [
+ -76.278098,
+ 43.520692
+ ],
+ [
+ -76.274908,
+ 43.519735
+ ],
+ [
+ -76.27064761038359,
+ 43.520566738467295
+ ],
+ [
+ -76.270216,
+ 43.520651
+ ],
+ [
+ -76.265016,
+ 43.522803
+ ],
+ [
+ -76.259858,
+ 43.524728
+ ],
+ [
+ -76.246513,
+ 43.527137
+ ],
+ [
+ -76.24011442458759,
+ 43.528406648965195
+ ],
+ [
+ -76.235834,
+ 43.529256
+ ],
+ [
+ -76.228701,
+ 43.532987
+ ],
+ [
+ -76.221234,
+ 43.539567
+ ],
+ [
+ -76.219003479432,
+ 43.543372366133795
+ ],
+ [
+ -76.217958,
+ 43.545156
+ ],
+ [
+ -76.209853,
+ 43.560136
+ ],
+ [
+ -76.203473,
+ 43.574978
+ ],
+ [
+ -76.199138,
+ 43.600454
+ ],
+ [
+ -76.19842840863049,
+ 43.614217895222296
+ ],
+ [
+ -76.19673175407301,
+ 43.647127787538096
+ ],
+ [
+ -76.196596,
+ 43.649761
+ ],
+ [
+ -76.19658,
+ 43.66316
+ ],
+ [
+ -76.1996693718617,
+ 43.6801913412181
+ ],
+ [
+ -76.201199,
+ 43.688624
+ ],
+ [
+ -76.20197,
+ 43.694107
+ ],
+ [
+ -76.201031,
+ 43.696666
+ ],
+ [
+ -76.20500890347809,
+ 43.7166096999579
+ ],
+ [
+ -76.205436,
+ 43.718751
+ ],
+ [
+ -76.2124352548822,
+ 43.7500688141606
+ ],
+ [
+ -76.213205,
+ 43.753513
+ ],
+ [
+ -76.2156962394984,
+ 43.7613640568318
+ ],
+ [
+ -76.2240561850703,
+ 43.7877101419181
+ ],
+ [
+ -76.229268,
+ 43.804135
+ ],
+ [
+ -76.237566,
+ 43.810643
+ ],
+ [
+ -76.2375496088352,
+ 43.8110566548624
+ ],
+ [
+ -76.23740849379931,
+ 43.814617897864
+ ],
+ [
+ -76.2373812249232,
+ 43.8153060675794
+ ],
+ [
+ -76.237363,
+ 43.815766
+ ],
+ [
+ -76.234035,
+ 43.819882
+ ],
+ [
+ -76.234986,
+ 43.822625
+ ],
+ [
+ -76.24326,
+ 43.816208
+ ],
+ [
+ -76.248534,
+ 43.817481
+ ],
+ [
+ -76.248771,
+ 43.819539
+ ],
+ [
+ -76.245919,
+ 43.820911
+ ],
+ [
+ -76.250197,
+ 43.825541
+ ],
+ [
+ -76.254238,
+ 43.826741
+ ],
+ [
+ -76.263954,
+ 43.824837
+ ],
+ [
+ -76.26636,
+ 43.825884
+ ],
+ [
+ -76.270008,
+ 43.824838
+ ],
+ [
+ -76.271113,
+ 43.828284
+ ],
+ [
+ -76.267073,
+ 43.833771
+ ],
+ [
+ -76.265409,
+ 43.835828
+ ],
+ [
+ -76.267786,
+ 43.838228
+ ],
+ [
+ -76.271589,
+ 43.837371
+ ],
+ [
+ -76.274679,
+ 43.838228
+ ],
+ [
+ -76.278006,
+ 43.840971
+ ],
+ [
+ -76.28371,
+ 43.838914
+ ],
+ [
+ -76.291955,
+ 43.837412
+ ],
+ [
+ -76.299064,
+ 43.838503
+ ],
+ [
+ -76.294819,
+ 43.849266
+ ],
+ [
+ -76.297733,
+ 43.852113
+ ],
+ [
+ -76.2974730250794,
+ 43.8550192299041
+ ],
+ [
+ -76.297392,
+ 43.855925
+ ],
+ [
+ -76.28977650011821,
+ 43.8640560908907
+ ],
+ [
+ -76.286004,
+ 43.868084
+ ],
+ [
+ -76.2775647508892,
+ 43.873898384551794
+ ],
+ [
+ -76.27469,
+ 43.875879
+ ],
+ [
+ -76.274012311003,
+ 43.8761615390416
+ ],
+ [
+ -76.26494700736849,
+ 43.8799410045663
+ ],
+ [
+ -76.260289,
+ 43.881883
+ ],
+ [
+ -76.251915,
+ 43.880714
+ ],
+ [
+ -76.228261,
+ 43.886645
+ ],
+ [
+ -76.22551459813359,
+ 43.8883323686976
+ ],
+ [
+ -76.2231090437313,
+ 43.889810323271
+ ],
+ [
+ -76.221438,
+ 43.890837
+ ],
+ [
+ -76.2196856321531,
+ 43.8929819785928
+ ],
+ [
+ -76.2192470390669,
+ 43.8935188366403
+ ],
+ [
+ -76.213761,
+ 43.900234
+ ],
+ [
+ -76.210804,
+ 43.896228
+ ],
+ [
+ -76.215929,
+ 43.892089
+ ],
+ [
+ -76.21689011939009,
+ 43.8902854232105
+ ],
+ [
+ -76.22210297899849,
+ 43.880503295523894
+ ],
+ [
+ -76.222676,
+ 43.879428
+ ],
+ [
+ -76.227485,
+ 43.875061
+ ],
+ [
+ -76.237363,
+ 43.863596
+ ],
+ [
+ -76.234273,
+ 43.862225
+ ],
+ [
+ -76.225948,
+ 43.865635
+ ],
+ [
+ -76.220488,
+ 43.864453
+ ],
+ [
+ -76.215021,
+ 43.862568
+ ],
+ [
+ -76.214546,
+ 43.858969
+ ],
+ [
+ -76.210267,
+ 43.858112
+ ],
+ [
+ -76.207653,
+ 43.855712
+ ],
+ [
+ -76.2071437889566,
+ 43.85396858132759
+ ],
+ [
+ -76.206702,
+ 43.852456
+ ],
+ [
+ -76.20649484920719,
+ 43.85249336666939
+ ],
+ [
+ -76.2040320034607,
+ 43.8529376244086
+ ],
+ [
+ -76.202899,
+ 43.853142
+ ],
+ [
+ -76.199809,
+ 43.854341
+ ],
+ [
+ -76.199572,
+ 43.857084
+ ],
+ [
+ -76.202662,
+ 43.86291
+ ],
+ [
+ -76.202257,
+ 43.864898
+ ],
+ [
+ -76.192777,
+ 43.869175
+ ],
+ [
+ -76.180604,
+ 43.877529
+ ],
+ [
+ -76.173652,
+ 43.88049
+ ],
+ [
+ -76.169083,
+ 43.881439
+ ],
+ [
+ -76.16661,
+ 43.883797
+ ],
+ [
+ -76.158249,
+ 43.887542
+ ],
+ [
+ -76.153155,
+ 43.890511
+ ],
+ [
+ -76.145506,
+ 43.888681
+ ],
+ [
+ -76.133267,
+ 43.892975
+ ],
+ [
+ -76.1327746423071,
+ 43.8933794543134
+ ],
+ [
+ -76.127285,
+ 43.897889
+ ],
+ [
+ -76.12664575195001,
+ 43.903757135263795
+ ],
+ [
+ -76.126495,
+ 43.905141
+ ],
+ [
+ -76.128136,
+ 43.907647
+ ],
+ [
+ -76.125023,
+ 43.912773
+ ],
+ [
+ -76.128196,
+ 43.916781
+ ],
+ [
+ -76.125846,
+ 43.92106
+ ],
+ [
+ -76.129706,
+ 43.927812
+ ],
+ [
+ -76.130446,
+ 43.933082
+ ],
+ [
+ -76.133188,
+ 43.934755
+ ],
+ [
+ -76.13478624523809,
+ 43.93468003195
+ ],
+ [
+ -76.136663,
+ 43.934592
+ ],
+ [
+ -76.1369671280285,
+ 43.93537406155949
+ ],
+ [
+ -76.13864586615679,
+ 43.9396909164223
+ ],
+ [
+ -76.139069,
+ 43.940779
+ ],
+ [
+ -76.134358,
+ 43.945664
+ ],
+ [
+ -76.12704701844801,
+ 43.949258238480404
+ ],
+ [
+ -76.124869,
+ 43.950329
+ ],
+ [
+ -76.123397,
+ 43.950329
+ ],
+ [
+ -76.120828,
+ 43.950329
+ ],
+ [
+ -76.1204006897083,
+ 43.950059711346896
+ ],
+ [
+ -76.11899373563611,
+ 43.9491730564398
+ ],
+ [
+ -76.118927,
+ 43.949131
+ ],
+ [
+ -76.1187911862731,
+ 43.949224
+ ],
+ [
+ -76.1117194018609,
+ 43.9540664851085
+ ],
+ [
+ -76.1115872574273,
+ 43.9541569725179
+ ],
+ [
+ -76.109182,
+ 43.955804
+ ],
+ [
+ -76.1085778326937,
+ 43.9565092969714
+ ],
+ [
+ -76.100388,
+ 43.96607
+ ],
+ [
+ -76.092903,
+ 43.971904
+ ],
+ [
+ -76.082981,
+ 43.977044
+ ],
+ [
+ -76.078289,
+ 43.976503
+ ],
+ [
+ -76.073621,
+ 43.975623
+ ],
+ [
+ -76.072843,
+ 43.970185
+ ],
+ [
+ -76.068565,
+ 43.970065
+ ],
+ [
+ -76.060063,
+ 43.974544
+ ],
+ [
+ -76.061181,
+ 43.977261
+ ],
+ [
+ -76.059062,
+ 43.9857
+ ],
+ [
+ -76.061507,
+ 43.987859
+ ],
+ [
+ -76.0625221719872,
+ 43.987998306981495
+ ],
+ [
+ -76.066098,
+ 43.988489
+ ],
+ [
+ -76.070787,
+ 43.988538
+ ],
+ [
+ -76.07217940366039,
+ 43.99054159369901
+ ],
+ [
+ -76.073899,
+ 43.993016
+ ],
+ [
+ -76.0784,
+ 43.996214
+ ],
+ [
+ -76.0839552466729,
+ 43.995315063113296
+ ],
+ [
+ -76.085068,
+ 43.995135
+ ],
+ [
+ -76.10015,
+ 43.98591
+ ],
+ [
+ -76.124156,
+ 43.969833
+ ],
+ [
+ -76.13628,
+ 43.964671
+ ],
+ [
+ -76.13635527310839,
+ 43.964676516834295
+ ],
+ [
+ -76.146022,
+ 43.965385
+ ],
+ [
+ -76.15193546880039,
+ 43.9624742724053
+ ],
+ [
+ -76.159004,
+ 43.958995
+ ],
+ [
+ -76.161226,
+ 43.960285
+ ],
+ [
+ -76.169553,
+ 43.958713
+ ],
+ [
+ -76.16966105404668,
+ 43.960227058509794
+ ],
+ [
+ -76.169802,
+ 43.962202
+ ],
+ [
+ -76.175019,
+ 43.964359
+ ],
+ [
+ -76.174786794121,
+ 43.9648366766759
+ ],
+ [
+ -76.1745986676018,
+ 43.965223676569
+ ],
+ [
+ -76.173356,
+ 43.96778
+ ],
+ [
+ -76.170741,
+ 43.970688
+ ],
+ [
+ -76.17451821271389,
+ 43.974045522412396
+ ],
+ [
+ -76.174782,
+ 43.97428
+ ],
+ [
+ -76.178109,
+ 43.97428
+ ],
+ [
+ -76.184874,
+ 43.971128
+ ],
+ [
+ -76.1902599169019,
+ 43.9700080795879
+ ],
+ [
+ -76.200249,
+ 43.967931
+ ],
+ [
+ -76.20048748308089,
+ 43.968220521206696
+ ],
+ [
+ -76.201291,
+ 43.969196
+ ],
+ [
+ -76.19946,
+ 43.971543
+ ],
+ [
+ -76.200926,
+ 43.97428
+ ],
+ [
+ -76.207819,
+ 43.975307
+ ],
+ [
+ -76.208009,
+ 43.977348
+ ],
+ [
+ -76.20764,
+ 43.982964
+ ],
+ [
+ -76.202548,
+ 43.989417
+ ],
+ [
+ -76.18732,
+ 44.000363
+ ],
+ [
+ -76.180011,
+ 44.000616
+ ],
+ [
+ -76.170741,
+ 44.004548
+ ],
+ [
+ -76.15862,
+ 44.006086
+ ],
+ [
+ -76.148637,
+ 44.007967
+ ],
+ [
+ -76.128785,
+ 44.019874
+ ],
+ [
+ -76.120695,
+ 44.031296
+ ],
+ [
+ -76.121171,
+ 44.034151
+ ],
+ [
+ -76.1217799999191,
+ 44.0368324712751
+ ],
+ [
+ -76.122017,
+ 44.037876
+ ],
+ [
+ -76.12217261944679,
+ 44.0378525664051
+ ],
+ [
+ -76.129654,
+ 44.036726
+ ],
+ [
+ -76.135802,
+ 44.039072
+ ],
+ [
+ -76.140318,
+ 44.038388
+ ],
+ [
+ -76.149724,
+ 44.03082
+ ],
+ [
+ -76.159718,
+ 44.029868
+ ],
+ [
+ -76.168284,
+ 44.032723
+ ],
+ [
+ -76.167651,
+ 44.034629
+ ],
+ [
+ -76.151628,
+ 44.046048
+ ],
+ [
+ -76.146869,
+ 44.054614
+ ],
+ [
+ -76.14697152884901,
+ 44.0547549872668
+ ],
+ [
+ -76.14959426098669,
+ 44.058361502302496
+ ],
+ [
+ -76.1501855641868,
+ 44.0591746024475
+ ],
+ [
+ -76.150676,
+ 44.059849
+ ],
+ [
+ -76.15474382279001,
+ 44.0640338958077
+ ],
+ [
+ -76.155054,
+ 44.064353
+ ],
+ [
+ -76.164599,
+ 44.062499
+ ],
+ [
+ -76.166586,
+ 44.063764
+ ],
+ [
+ -76.170741,
+ 44.064695
+ ],
+ [
+ -76.174782,
+ 44.064012
+ ],
+ [
+ -76.179298,
+ 44.061279
+ ],
+ [
+ -76.184527,
+ 44.058717
+ ],
+ [
+ -76.188092,
+ 44.059571
+ ],
+ [
+ -76.197124,
+ 44.057863
+ ],
+ [
+ -76.20428,
+ 44.054271
+ ],
+ [
+ -76.207582,
+ 44.056155
+ ],
+ [
+ -76.211384,
+ 44.057351
+ ],
+ [
+ -76.21397,
+ 44.059373
+ ],
+ [
+ -76.213494,
+ 44.061277
+ ],
+ [
+ -76.20588,
+ 44.07016
+ ],
+ [
+ -76.199976,
+ 44.07682
+ ],
+ [
+ -76.2008218482054,
+ 44.0779479670479
+ ],
+ [
+ -76.20164,
+ 44.079039
+ ],
+ [
+ -76.2130980069555,
+ 44.070810995005296
+ ],
+ [
+ -76.214446,
+ 44.069843
+ ],
+ [
+ -76.2162931764491,
+ 44.0687062071222
+ ],
+ [
+ -76.21895645696809,
+ 44.0670671659105
+ ],
+ [
+ -76.220632,
+ 44.066036
+ ],
+ [
+ -76.2263891655378,
+ 44.0649381679225
+ ],
+ [
+ -76.231627447479,
+ 44.063939281594095
+ ],
+ [
+ -76.24044787033121,
+ 44.062257317947
+ ],
+ [
+ -76.244498,
+ 44.061485
+ ],
+ [
+ -76.2451719406062,
+ 44.0620500457571
+ ],
+ [
+ -76.2468819048657,
+ 44.063483715194295
+ ],
+ [
+ -76.247512,
+ 44.064012
+ ],
+ [
+ -76.252741,
+ 44.059913
+ ],
+ [
+ -76.263436,
+ 44.052739
+ ],
+ [
+ -76.2635494791351,
+ 44.0524128156831
+ ],
+ [
+ -76.2643694517254,
+ 44.0500558872582
+ ],
+ [
+ -76.2651,
+ 44.047956
+ ],
+ [
+ -76.272706,
+ 44.04078
+ ],
+ [
+ -76.277222,
+ 44.03292
+ ],
+ [
+ -76.27876913967229,
+ 44.0269111169237
+ ],
+ [
+ -76.2796641578959,
+ 44.02343498613009
+ ],
+ [
+ -76.2801410227294,
+ 44.02158290704539
+ ],
+ [
+ -76.28093887930979,
+ 44.018484139048404
+ ],
+ [
+ -76.281071,
+ 44.017971
+ ],
+ [
+ -76.28040223281249,
+ 44.01743598625
+ ],
+ [
+ -76.278691,
+ 44.016067
+ ],
+ [
+ -76.2744920199611,
+ 44.0165336622691
+ ],
+ [
+ -76.274408,
+ 44.016543
+ ],
+ [
+ -76.2639368100241,
+ 44.019583
+ ],
+ [
+ -76.25322911438579,
+ 44.022691662417095
+ ],
+ [
+ -76.2483422021728,
+ 44.0241104326965
+ ],
+ [
+ -76.2400035137294,
+ 44.0265313240113
+ ],
+ [
+ -76.23015,
+ 44.029392
+ ],
+ [
+ -76.214922,
+ 44.030344
+ ],
+ [
+ -76.2115061522646,
+ 44.0302174575825
+ ],
+ [
+ -76.20417063661058,
+ 44.029945708384005
+ ],
+ [
+ -76.202073,
+ 44.029868
+ ],
+ [
+ -76.200169,
+ 44.02844
+ ],
+ [
+ -76.2001174751766,
+ 44.028130959305095
+ ],
+ [
+ -76.199693,
+ 44.025585
+ ],
+ [
+ -76.19986344367429,
+ 44.0253418920436
+ ],
+ [
+ -76.204016,
+ 44.019419
+ ],
+ [
+ -76.220179,
+ 44.002496
+ ],
+ [
+ -76.219941,
+ 43.996854
+ ],
+ [
+ -76.221129,
+ 43.993947
+ ],
+ [
+ -76.236864,
+ 43.9779
+ ],
+ [
+ -76.25244,
+ 43.967922
+ ],
+ [
+ -76.254555,
+ 43.966213
+ ],
+ [
+ -76.260584,
+ 43.967438
+ ],
+ [
+ -76.268032,
+ 43.964666
+ ],
+ [
+ -76.271993,
+ 43.960766
+ ],
+ [
+ -76.280677,
+ 43.959683
+ ],
+ [
+ -76.283639,
+ 43.962648
+ ],
+ [
+ -76.284114,
+ 43.9669
+ ],
+ [
+ -76.279314,
+ 43.972462
+ ],
+ [
+ -76.273097,
+ 43.979842
+ ],
+ [
+ -76.268702,
+ 43.987278
+ ],
+ [
+ -76.265903,
+ 43.994552
+ ],
+ [
+ -76.269672,
+ 44.001148
+ ],
+ [
+ -76.274202,
+ 44.001951
+ ],
+ [
+ -76.276459,
+ 44.006173
+ ],
+ [
+ -76.281928,
+ 44.009177
+ ],
+ [
+ -76.287821,
+ 44.01142
+ ],
+ [
+ -76.296487,
+ 44.008489
+ ],
+ [
+ -76.300956,
+ 44.009864
+ ],
+ [
+ -76.302481,
+ 44.013583
+ ],
+ [
+ -76.300576,
+ 44.016763
+ ],
+ [
+ -76.301345,
+ 44.020602
+ ],
+ [
+ -76.307674,
+ 44.025277
+ ],
+ [
+ -76.307486,
+ 44.026362
+ ],
+ [
+ -76.301465,
+ 44.030699
+ ],
+ [
+ -76.300514,
+ 44.033775
+ ],
+ [
+ -76.301197,
+ 44.037799
+ ],
+ [
+ -76.300514,
+ 44.040268
+ ],
+ [
+ -76.295998,
+ 44.04266
+ ],
+ [
+ -76.2952619427254,
+ 44.0464983449876
+ ],
+ [
+ -76.295048,
+ 44.047614
+ ],
+ [
+ -76.29513380706601,
+ 44.0476463044434
+ ],
+ [
+ -76.300039,
+ 44.049493
+ ],
+ [
+ -76.2997920745,
+ 44.0498479026513
+ ],
+ [
+ -76.2964415473668,
+ 44.0546635695749
+ ],
+ [
+ -76.296236,
+ 44.054959
+ ],
+ [
+ -76.295285,
+ 44.058717
+ ],
+ [
+ -76.29974456263909,
+ 44.059175284381794
+ ],
+ [
+ -76.300277,
+ 44.05923
+ ],
+ [
+ -76.30084856398501,
+ 44.0591504868235
+ ],
+ [
+ -76.307645,
+ 44.058205
+ ],
+ [
+ -76.315726,
+ 44.059059
+ ],
+ [
+ -76.334431,
+ 44.06403
+ ],
+ [
+ -76.334978,
+ 44.069135
+ ],
+ [
+ -76.3337269693252,
+ 44.070708
+ ],
+ [
+ -76.33238447741209,
+ 44.072396
+ ],
+ [
+ -76.332126,
+ 44.072721
+ ],
+ [
+ -76.335929,
+ 44.075795
+ ],
+ [
+ -76.347813,
+ 44.070843
+ ],
+ [
+ -76.360306,
+ 44.070907
+ ],
+ [
+ -76.361836,
+ 44.072721
+ ],
+ [
+ -76.359498,
+ 44.076671
+ ],
+ [
+ -76.34496,
+ 44.08621
+ ],
+ [
+ -76.344247,
+ 44.087917
+ ],
+ [
+ -76.346862,
+ 44.09082
+ ],
+ [
+ -76.349714,
+ 44.092527
+ ],
+ [
+ -76.360798,
+ 44.087644
+ ],
+ [
+ -76.35791,
+ 44.093408
+ ],
+ [
+ -76.360972,
+ 44.094446
+ ],
+ [
+ -76.358033,
+ 44.099013
+ ],
+ [
+ -76.360172,
+ 44.101403
+ ],
+ [
+ -76.367009,
+ 44.099425
+ ],
+ [
+ -76.370706,
+ 44.100499
+ ],
+ [
+ -76.369699,
+ 44.104671
+ ],
+ [
+ -76.363835,
+ 44.111696
+ ],
+ [
+ -76.353667,
+ 44.118411
+ ],
+ [
+ -76.347308,
+ 44.124224
+ ],
+ [
+ -76.3478158570738,
+ 44.1247720803733
+ ],
+ [
+ -76.355679,
+ 44.133258
+ ],
+ [
+ -76.352707,
+ 44.134728
+ ],
+ [
+ -76.312647,
+ 44.199044
+ ],
+ [
+ -76.286547,
+ 44.203773
+ ],
+ [
+ -76.249661,
+ 44.204171
+ ],
+ [
+ -76.245487,
+ 44.203669
+ ],
+ [
+ -76.206777,
+ 44.214543
+ ],
+ [
+ -76.201807410824,
+ 44.2166985580988
+ ],
+ [
+ -76.191328,
+ 44.221244
+ ],
+ [
+ -76.164265,
+ 44.239603
+ ],
+ [
+ -76.161833,
+ 44.280777
+ ],
+ [
+ -76.130884,
+ 44.296635
+ ],
+ [
+ -76.126565,
+ 44.294581
+ ],
+ [
+ -76.118136,
+ 44.29485
+ ],
+ [
+ -76.111931,
+ 44.298031
+ ],
+ [
+ -76.097351,
+ 44.299547
+ ],
+ [
+ -76.0710166613692,
+ 44.315803930992494
+ ],
+ [
+ -76.045228,
+ 44.331724
+ ],
+ [
+ -76.008361,
+ 44.343856
+ ],
+ [
+ -76.000998,
+ 44.347534
+ ],
+ [
+ -75.983333765376,
+ 44.347410580108495
+ ],
+ [
+ -75.982392,
+ 44.347404
+ ],
+ [
+ -75.980316859834,
+ 44.3471394966074
+ ],
+ [
+ -75.9802001064945,
+ 44.3471246148876
+ ],
+ [
+ -75.9799341412711,
+ 44.3470907141878
+ ],
+ [
+ -75.978281,
+ 44.34688
+ ],
+ [
+ -75.974839,
+ 44.346172
+ ],
+ [
+ -75.9744379256881,
+ 44.3456020522936
+ ],
+ [
+ -75.973053,
+ 44.343634
+ ],
+ [
+ -75.970185,
+ 44.342835
+ ],
+ [
+ -75.94954,
+ 44.349129
+ ],
+ [
+ -75.939664,
+ 44.355395
+ ],
+ [
+ -75.929465,
+ 44.359603
+ ],
+ [
+ -75.921719,
+ 44.368886
+ ],
+ [
+ -75.912985,
+ 44.368084
+ ],
+ [
+ -75.871496,
+ 44.394839
+ ],
+ [
+ -75.8600599283155,
+ 44.4032818662487
+ ],
+ [
+ -75.82083,
+ 44.432244
+ ],
+ [
+ -75.8114400958567,
+ 44.4605892515513
+ ],
+ [
+ -75.807778,
+ 44.471644
+ ],
+ [
+ -75.76623,
+ 44.515851
+ ],
+ [
+ -75.73821051623919,
+ 44.53513307927089
+ ],
+ [
+ -75.727052,
+ 44.542812
+ ],
+ [
+ -75.696586,
+ 44.567583
+ ],
+ [
+ -75.662381,
+ 44.591934
+ ],
+ [
+ -75.6608838843897,
+ 44.592876240356006
+ ],
+ [
+ -75.618364,
+ 44.619637
+ ],
+ [
+ -75.6103096123732,
+ 44.625848762581796
+ ],
+ [
+ -75.580912,
+ 44.648521
+ ],
+ [
+ -75.5800378335611,
+ 44.6491801589514
+ ],
+ [
+ -75.52094209041239,
+ 44.6937408814312
+ ],
+ [
+ -75.5061508419351,
+ 44.7048941165614
+ ],
+ [
+ -75.505903,
+ 44.705081
+ ],
+ [
+ -75.50012907423441,
+ 44.7081748239223
+ ],
+ [
+ -75.47969000794969,
+ 44.71912662254049
+ ],
+ [
+ -75.477642,
+ 44.720224
+ ],
+ [
+ -75.4579051821859,
+ 44.7334942249051
+ ],
+ [
+ -75.4441105902894,
+ 44.7427691413918
+ ],
+ [
+ -75.423943,
+ 44.756329
+ ],
+ [
+ -75.413792,
+ 44.772534
+ ],
+ [
+ -75.397007,
+ 44.773471
+ ],
+ [
+ -75.387371,
+ 44.78003
+ ],
+ [
+ -75.369953,
+ 44.782883
+ ],
+ [
+ -75.369829,
+ 44.788065
+ ],
+ [
+ -75.344538,
+ 44.809139
+ ],
+ [
+ -75.333744,
+ 44.806378
+ ],
+ [
+ -75.3060118210584,
+ 44.824063287496095
+ ],
+ [
+ -75.301976,
+ 44.826637
+ ],
+ [
+ -75.30763,
+ 44.836813
+ ],
+ [
+ -75.283136,
+ 44.849156
+ ],
+ [
+ -75.26825,
+ 44.855119
+ ],
+ [
+ -75.255517,
+ 44.857651
+ ],
+ [
+ -75.2457053666933,
+ 44.8640754316298
+ ],
+ [
+ -75.241303,
+ 44.866958
+ ],
+ [
+ -75.228635,
+ 44.8679
+ ],
+ [
+ -75.218576,
+ 44.877569
+ ],
+ [
+ -75.203012,
+ 44.877548
+ ],
+ [
+ -75.194072,
+ 44.882625
+ ],
+ [
+ -75.188283,
+ 44.88322
+ ],
+ [
+ -75.165123,
+ 44.893324
+ ],
+ [
+ -75.139866,
+ 44.896684
+ ],
+ [
+ -75.13887125836109,
+ 44.90004567917501
+ ],
+ [
+ -75.134416,
+ 44.915102
+ ],
+ [
+ -75.117575,
+ 44.921342
+ ],
+ [
+ -75.105086,
+ 44.919541
+ ],
+ [
+ -75.096659,
+ 44.927067
+ ],
+ [
+ -75.064826,
+ 44.929449
+ ],
+ [
+ -75.059966,
+ 44.93457
+ ],
+ [
+ -75.027125,
+ 44.946568
+ ],
+ [
+ -75.0154399031161,
+ 44.9528621027093
+ ],
+ [
+ -75.005155,
+ 44.958402
+ ],
+ [
+ -74.999655,
+ 44.965921
+ ],
+ [
+ -74.99927,
+ 44.971638
+ ],
+ [
+ -74.992756,
+ 44.977449
+ ],
+ [
+ -74.972463,
+ 44.983402
+ ],
+ [
+ -74.946686,
+ 44.984665
+ ],
+ [
+ -74.9394468687615,
+ 44.984420891934
+ ],
+ [
+ -74.907956,
+ 44.983359
+ ],
+ [
+ -74.900733,
+ 44.992754
+ ],
+ [
+ -74.887837,
+ 45.000046
+ ],
+ [
+ -74.877232,
+ 45.001362
+ ],
+ [
+ -74.86664,
+ 45.000536
+ ],
+ [
+ -74.862643,
+ 45.004591
+ ],
+ [
+ -74.856422,
+ 45.004524
+ ],
+ [
+ -74.846175,
+ 45.01029
+ ],
+ [
+ -74.841731,
+ 45.011438
+ ],
+ [
+ -74.834669,
+ 45.014683
+ ],
+ [
+ -74.826578,
+ 45.01585
+ ],
+ [
+ -74.817195,
+ 45.011728
+ ],
+ [
+ -74.813263,
+ 45.013543
+ ],
+ [
+ -74.801638,
+ 45.014569
+ ],
+ [
+ -74.799885,
+ 45.010707
+ ],
+ [
+ -74.793148,
+ 45.004647
+ ],
+ [
+ -74.763407,
+ 45.005613
+ ],
+ [
+ -74.760215,
+ 44.994946
+ ],
+ [
+ -74.7571835295881,
+ 44.994095631189104
+ ],
+ [
+ -74.74464,
+ 44.990577
+ ],
+ [
+ -74.731301,
+ 44.990422
+ ],
+ [
+ -74.72622806320749,
+ 44.994863072200594
+ ],
+ [
+ -74.722574,
+ 44.998062
+ ],
+ [
+ -74.702018,
+ 45.003322
+ ],
+ [
+ -74.683973,
+ 44.99969
+ ],
+ [
+ -74.678428,
+ 45.000047
+ ],
+ [
+ -74.673047,
+ 45.000942
+ ],
+ [
+ -74.670297,
+ 45.006194
+ ],
+ [
+ -74.661478,
+ 44.999592
+ ],
+ [
+ -74.6470419812019,
+ 44.999477367294595
+ ],
+ [
+ -74.57163594769101,
+ 44.998878587413
+ ],
+ [
+ -74.54902,
+ 44.998699
+ ],
+ [
+ -74.45753,
+ 44.997032
+ ],
+ [
+ -74.44185363593259,
+ 44.996375070320504
+ ],
+ [
+ -74.42484531530368,
+ 44.995662324011896
+ ],
+ [
+ -74.3720249067643,
+ 44.9934488455608
+ ],
+ [
+ -74.3428134722486,
+ 44.9922247187012
+ ],
+ [
+ -74.335184,
+ 44.991905
+ ],
+ [
+ -74.2430770414636,
+ 44.9921264986039
+ ],
+ [
+ -74.234136,
+ 44.992148
+ ],
+ [
+ -74.2022634398789,
+ 44.9919114797765
+ ],
+ [
+ -74.146814,
+ 44.9915
+ ],
+ [
+ -74.1446962015614,
+ 44.991575643160495
+ ],
+ [
+ -74.0273918752465,
+ 44.995765498918
+ ],
+ [
+ -73.9584110696443,
+ 44.99822934347169
+ ],
+ [
+ -73.874597,
+ 45.001223
+ ],
+ [
+ -73.81525680431429,
+ 45.0022943050058
+ ],
+ [
+ -73.81156963696829,
+ 45.0023608717029
+ ],
+ [
+ -73.762985,
+ 45.003238
+ ],
+ [
+ -73.675458,
+ 45.002907
+ ],
+ [
+ -73.6520405848233,
+ 45.0032719552393
+ ],
+ [
+ -73.639718,
+ 45.003464
+ ],
+ [
+ -73.56023459348219,
+ 45.0057163578456
+ ],
+ [
+ -73.5193094554483,
+ 45.0068760723038
+ ],
+ [
+ -73.4526741232215,
+ 45.0087643483592
+ ],
+ [
+ -73.437371,
+ 45.009198
+ ],
+ [
+ -73.388661291942,
+ 45.0100466354009
+ ],
+ [
+ -73.3674541712486,
+ 45.010416112330496
+ ],
+ [
+ -73.343124,
+ 45.01084
+ ],
+ [
+ -73.34822388923259,
+ 44.9989017541974
+ ],
+ [
+ -73.350188,
+ 44.994304
+ ],
+ [
+ -73.35335542032409,
+ 44.990258966762894
+ ],
+ [
+ -73.353429,
+ 44.990165
+ ],
+ [
+ -73.354633,
+ 44.987352
+ ],
+ [
+ -73.354112,
+ 44.984062
+ ],
+ [
+ -73.3537167558164,
+ 44.982960087586
+ ],
+ [
+ -73.352886,
+ 44.980644
+ ],
+ [
+ -73.350218,
+ 44.976222
+ ],
+ [
+ -73.34474,
+ 44.970468
+ ],
+ [
+ -73.338734,
+ 44.965886
+ ],
+ [
+ -73.338243,
+ 44.96475
+ ],
+ [
+ -73.337906,
+ 44.960541
+ ],
+ [
+ -73.339603,
+ 44.94337
+ ],
+ [
+ -73.338482,
+ 44.924112
+ ],
+ [
+ -73.338979,
+ 44.917681
+ ],
+ [
+ -73.3395342002786,
+ 44.9168851346264
+ ],
+ [
+ -73.341106,
+ 44.914632
+ ],
+ [
+ -73.3427866086322,
+ 44.913802307163195
+ ],
+ [
+ -73.347837,
+ 44.911309
+ ],
+ [
+ -73.353657,
+ 44.907346
+ ],
+ [
+ -73.356218,
+ 44.904492
+ ],
+ [
+ -73.35808,
+ 44.901325
+ ],
+ [
+ -73.360327,
+ 44.897236
+ ],
+ [
+ -73.362229,
+ 44.891463
+ ],
+ [
+ -73.3630566734973,
+ 44.88824955275489
+ ],
+ [
+ -73.366459,
+ 44.87504
+ ],
+ [
+ -73.369103,
+ 44.86668
+ ],
+ [
+ -73.371967,
+ 44.862414
+ ],
+ [
+ -73.375709,
+ 44.860745
+ ],
+ [
+ -73.379822,
+ 44.857037
+ ],
+ [
+ -73.381397,
+ 44.848805
+ ],
+ [
+ -73.381359,
+ 44.845021
+ ],
+ [
+ -73.379452,
+ 44.83801
+ ],
+ [
+ -73.378717,
+ 44.837358
+ ],
+ [
+ -73.375345,
+ 44.836307
+ ],
+ [
+ -73.371329,
+ 44.830742
+ ],
+ [
+ -73.369647,
+ 44.829136
+ ],
+ [
+ -73.3680566215151,
+ 44.8280601203749
+ ],
+ [
+ -73.365678,
+ 44.826451
+ ],
+ [
+ -73.35808,
+ 44.82331
+ ],
+ [
+ -73.354945,
+ 44.8215
+ ],
+ [
+ -73.353472,
+ 44.820386
+ ],
+ [
+ -73.3502,
+ 44.816394
+ ],
+ [
+ -73.3411277344487,
+ 44.8091445485274
+ ],
+ [
+ -73.335443,
+ 44.804602
+ ],
+ [
+ -73.33443,
+ 44.802188
+ ],
+ [
+ -73.333933,
+ 44.7992
+ ],
+ [
+ -73.333154,
+ 44.788759
+ ],
+ [
+ -73.333771,
+ 44.785192
+ ],
+ [
+ -73.335713,
+ 44.782086
+ ],
+ [
+ -73.344254,
+ 44.776282
+ ],
+ [
+ -73.347072,
+ 44.772988
+ ],
+ [
+ -73.348694,
+ 44.768246
+ ],
+ [
+ -73.3520072158159,
+ 44.76067477275169
+ ],
+ [
+ -73.35391933709289,
+ 44.7563052702748
+ ],
+ [
+ -73.354361,
+ 44.755296
+ ],
+ [
+ -73.357671,
+ 44.751018
+ ],
+ [
+ -73.363791,
+ 44.745254
+ ],
+ [
+ -73.365561,
+ 44.741786
+ ],
+ [
+ -73.365068,
+ 44.725646
+ ],
+ [
+ -73.36556,
+ 44.700297
+ ],
+ [
+ -73.36578375018149,
+ 44.6988278681129
+ ],
+ [
+ -73.365977,
+ 44.697559
+ ],
+ [
+ -73.364661,
+ 44.696394
+ ],
+ [
+ -73.361323,
+ 44.695369
+ ],
+ [
+ -73.361308,
+ 44.694523
+ ],
+ [
+ -73.365297,
+ 44.687546
+ ],
+ [
+ -73.370142,
+ 44.684853
+ ],
+ [
+ -73.369685,
+ 44.683758
+ ],
+ [
+ -73.367414,
+ 44.681292
+ ],
+ [
+ -73.367209,
+ 44.678513
+ ],
+ [
+ -73.3704090158919,
+ 44.6777022743243
+ ],
+ [
+ -73.371089,
+ 44.67753
+ ],
+ [
+ -73.371843,
+ 44.676956
+ ],
+ [
+ -73.3719437459439,
+ 44.676009576424704
+ ],
+ [
+ -73.37198,
+ 44.675669
+ ],
+ [
+ -73.371800465581,
+ 44.675131137091
+ ],
+ [
+ -73.37101,
+ 44.672763
+ ],
+ [
+ -73.37272,
+ 44.668739
+ ],
+ [
+ -73.370065,
+ 44.666071
+ ],
+ [
+ -73.369669,
+ 44.663478
+ ],
+ [
+ -73.37059,
+ 44.662518
+ ],
+ [
+ -73.373063,
+ 44.662713
+ ],
+ [
+ -73.374134,
+ 44.66234
+ ],
+ [
+ -73.375931,
+ 44.660315
+ ],
+ [
+ -73.377209,
+ 44.658142
+ ],
+ [
+ -73.379074,
+ 44.656772
+ ],
+ [
+ -73.378968,
+ 44.65518
+ ],
+ [
+ -73.378014,
+ 44.653846
+ ],
+ [
+ -73.377973,
+ 44.652918
+ ],
+ [
+ -73.380906,
+ 44.648871
+ ],
+ [
+ -73.383974,
+ 44.647605
+ ],
+ [
+ -73.384483,
+ 44.646683
+ ],
+ [
+ -73.383157,
+ 44.645764
+ ],
+ [
+ -73.378561,
+ 44.641475
+ ],
+ [
+ -73.379748,
+ 44.64036
+ ],
+ [
+ -73.386783,
+ 44.636369
+ ],
+ [
+ -73.387169,
+ 44.635542
+ ],
+ [
+ -73.3864312296218,
+ 44.6329290148338
+ ],
+ [
+ -73.385899,
+ 44.631044
+ ],
+ [
+ -73.386497,
+ 44.626924
+ ],
+ [
+ -73.387346,
+ 44.623672
+ ],
+ [
+ -73.389966,
+ 44.61962
+ ],
+ [
+ -73.390231,
+ 44.618353
+ ],
+ [
+ -73.38982,
+ 44.61721
+ ],
+ [
+ -73.382932,
+ 44.612184
+ ],
+ [
+ -73.380726,
+ 44.605239
+ ],
+ [
+ -73.376849,
+ 44.599598
+ ],
+ [
+ -73.376332,
+ 44.597218
+ ],
+ [
+ -73.376806,
+ 44.595455
+ ],
+ [
+ -73.377897,
+ 44.593848
+ ],
+ [
+ -73.38164,
+ 44.590583
+ ],
+ [
+ -73.381848,
+ 44.589316
+ ],
+ [
+ -73.377794,
+ 44.585128
+ ],
+ [
+ -73.375666,
+ 44.582038
+ ],
+ [
+ -73.374389,
+ 44.575455
+ ],
+ [
+ -73.367275,
+ 44.567545
+ ],
+ [
+ -73.36160725692869,
+ 44.5636027365224
+ ],
+ [
+ -73.3614860172538,
+ 44.563518406880696
+ ],
+ [
+ -73.360088,
+ 44.562546
+ ],
+ [
+ -73.35840562140748,
+ 44.56018659147689
+ ],
+ [
+ -73.356788,
+ 44.557918
+ ],
+ [
+ -73.355186,
+ 44.556918
+ ],
+ [
+ -73.350027,
+ 44.555392
+ ],
+ [
+ -73.342932,
+ 44.551907
+ ],
+ [
+ -73.338751,
+ 44.548046
+ ],
+ [
+ -73.33863,
+ 44.546844
+ ],
+ [
+ -73.33863044507319,
+ 44.5468424276295
+ ],
+ [
+ -73.3393,
+ 44.544477
+ ],
+ [
+ -73.338995,
+ 44.543302
+ ],
+ [
+ -73.331595,
+ 44.535924
+ ],
+ [
+ -73.330893,
+ 44.534269
+ ],
+ [
+ -73.330588,
+ 44.531034
+ ],
+ [
+ -73.329458,
+ 44.529203
+ ],
+ [
+ -73.328512,
+ 44.528478
+ ],
+ [
+ -73.323935,
+ 44.52712
+ ],
+ [
+ -73.322026,
+ 44.525289
+ ],
+ [
+ -73.3211898546784,
+ 44.5203251296318
+ ],
+ [
+ -73.321111,
+ 44.519857
+ ],
+ [
+ -73.321416,
+ 44.516454
+ ],
+ [
+ -73.320836,
+ 44.513631
+ ],
+ [
+ -73.319265,
+ 44.51196
+ ],
+ [
+ -73.312871,
+ 44.507246
+ ],
+ [
+ -73.306707,
+ 44.500334
+ ],
+ [
+ -73.304921,
+ 44.492209
+ ],
+ [
+ -73.304418,
+ 44.485739
+ ],
+ [
+ -73.299885,
+ 44.476652
+ ],
+ [
+ -73.2993423188855,
+ 44.4735840733609
+ ],
+ [
+ -73.298939,
+ 44.471304
+ ],
+ [
+ -73.298725,
+ 44.463957
+ ],
+ [
+ -73.300114,
+ 44.454711
+ ],
+ [
+ -73.295216,
+ 44.445884
+ ],
+ [
+ -73.293613,
+ 44.440559
+ ],
+ [
+ -73.29380572883369,
+ 44.4381674103822
+ ],
+ [
+ -73.293855,
+ 44.437556
+ ],
+ [
+ -73.296031,
+ 44.428339
+ ],
+ [
+ -73.310491,
+ 44.402601
+ ],
+ [
+ -73.312418,
+ 44.39471
+ ],
+ [
+ -73.315016,
+ 44.388513
+ ],
+ [
+ -73.317029,
+ 44.385978
+ ],
+ [
+ -73.320954,
+ 44.382669
+ ],
+ [
+ -73.330369,
+ 44.375987
+ ],
+ [
+ -73.333575,
+ 44.372288
+ ],
+ [
+ -73.334939,
+ 44.364441
+ ],
+ [
+ -73.334637,
+ 44.356877
+ ],
+ [
+ -73.327335,
+ 44.344369
+ ],
+ [
+ -73.32695510159479,
+ 44.3433650565242
+ ],
+ [
+ -73.325127,
+ 44.338534
+ ],
+ [
+ -73.323997,
+ 44.333842
+ ],
+ [
+ -73.323835,
+ 44.325418
+ ],
+ [
+ -73.32384550990301,
+ 44.3253266526594
+ ],
+ [
+ -73.324545,
+ 44.319247
+ ],
+ [
+ -73.324229,
+ 44.310023
+ ],
+ [
+ -73.322267,
+ 44.301523
+ ],
+ [
+ -73.316838,
+ 44.287683
+ ],
+ [
+ -73.312299,
+ 44.280025
+ ],
+ [
+ -73.311025,
+ 44.27424
+ ],
+ [
+ -73.312852,
+ 44.265346
+ ],
+ [
+ -73.3134220405831,
+ 44.2641991074088
+ ],
+ [
+ -73.316618,
+ 44.257769
+ ],
+ [
+ -73.3166377049938,
+ 44.257718116061895
+ ],
+ [
+ -73.319802,
+ 44.249547
+ ],
+ [
+ -73.323596,
+ 44.243897
+ ],
+ [
+ -73.324681,
+ 44.243614
+ ],
+ [
+ -73.329322,
+ 44.244504
+ ],
+ [
+ -73.3305,
+ 44.244254
+ ],
+ [
+ -73.334042,
+ 44.240971
+ ],
+ [
+ -73.336778,
+ 44.239557
+ ],
+ [
+ -73.34323,
+ 44.238049
+ ],
+ [
+ -73.342312,
+ 44.234531
+ ],
+ [
+ -73.3455355109189,
+ 44.232754814427004
+ ],
+ [
+ -73.349889,
+ 44.230356
+ ],
+ [
+ -73.350806,
+ 44.225943
+ ],
+ [
+ -73.354747,
+ 44.223599
+ ],
+ [
+ -73.355252,
+ 44.22287
+ ],
+ [
+ -73.355276,
+ 44.219554
+ ],
+ [
+ -73.357908,
+ 44.216193
+ ],
+ [
+ -73.361476,
+ 44.210374
+ ],
+ [
+ -73.362013,
+ 44.208545
+ ],
+ [
+ -73.370678,
+ 44.204546
+ ],
+ [
+ -73.372405,
+ 44.202165
+ ],
+ [
+ -73.375289,
+ 44.199868
+ ],
+ [
+ -73.377693,
+ 44.199453
+ ],
+ [
+ -73.382252,
+ 44.197178
+ ],
+ [
+ -73.383987,
+ 44.193158
+ ],
+ [
+ -73.385326,
+ 44.192597
+ ],
+ [
+ -73.388502,
+ 44.192318
+ ],
+ [
+ -73.390583,
+ 44.190886
+ ],
+ [
+ -73.390805,
+ 44.189072
+ ],
+ [
+ -73.3903779438358,
+ 44.18615930569089
+ ],
+ [
+ -73.389658,
+ 44.181249
+ ],
+ [
+ -73.390383,
+ 44.179486
+ ],
+ [
+ -73.395862,
+ 44.175785
+ ],
+ [
+ -73.396892,
+ 44.173846
+ ],
+ [
+ -73.397385,
+ 44.171596
+ ],
+ [
+ -73.396664,
+ 44.168831
+ ],
+ [
+ -73.395399,
+ 44.166903
+ ],
+ [
+ -73.395532,
+ 44.166122
+ ],
+ [
+ -73.398728,
+ 44.162248
+ ],
+ [
+ -73.399634,
+ 44.155326
+ ],
+ [
+ -73.40047738748059,
+ 44.1524185083939
+ ],
+ [
+ -73.402381,
+ 44.145856
+ ],
+ [
+ -73.403268,
+ 44.144295
+ ],
+ [
+ -73.408118,
+ 44.139373
+ ],
+ [
+ -73.41172,
+ 44.137825
+ ],
+ [
+ -73.415761,
+ 44.132826
+ ],
+ [
+ -73.41578,
+ 44.131523
+ ],
+ [
+ -73.413751,
+ 44.126068
+ ],
+ [
+ -73.411722,
+ 44.11754
+ ],
+ [
+ -73.411316,
+ 44.112686
+ ],
+ [
+ -73.4117592677759,
+ 44.111510804361394
+ ],
+ [
+ -73.4131113305903,
+ 44.1079262028884
+ ],
+ [
+ -73.416319,
+ 44.099422
+ ],
+ [
+ -73.4205590906893,
+ 44.0928557666786
+ ],
+ [
+ -73.429239,
+ 44.079414
+ ],
+ [
+ -73.430207,
+ 44.071716
+ ],
+ [
+ -73.431991,
+ 44.06345
+ ],
+ [
+ -73.43774,
+ 44.045006
+ ],
+ [
+ -73.43688,
+ 44.042578
+ ],
+ [
+ -73.430772,
+ 44.038746
+ ],
+ [
+ -73.427987,
+ 44.037708
+ ],
+ [
+ -73.4274431933012,
+ 44.0371550311584
+ ],
+ [
+ -73.42312,
+ 44.032759
+ ],
+ [
+ -73.42016,
+ 44.032004
+ ],
+ [
+ -73.414364,
+ 44.029526
+ ],
+ [
+ -73.410776,
+ 44.026944
+ ],
+ [
+ -73.407739,
+ 44.021312
+ ],
+ [
+ -73.40738403594659,
+ 44.0202750561591
+ ],
+ [
+ -73.405999,
+ 44.016229
+ ],
+ [
+ -73.405977,
+ 44.011485
+ ],
+ [
+ -73.411224,
+ 43.986202
+ ],
+ [
+ -73.412581,
+ 43.98272
+ ],
+ [
+ -73.412613,
+ 43.97998
+ ],
+ [
+ -73.411248,
+ 43.975596
+ ],
+ [
+ -73.406823,
+ 43.967317
+ ],
+ [
+ -73.405525,
+ 43.948813
+ ],
+ [
+ -73.408589,
+ 43.932933
+ ],
+ [
+ -73.4077427838004,
+ 43.9298898187203
+ ],
+ [
+ -73.407742,
+ 43.929887
+ ],
+ [
+ -73.404537867979,
+ 43.9238515171629
+ ],
+ [
+ -73.400926,
+ 43.917048
+ ],
+ [
+ -73.397256,
+ 43.905668
+ ],
+ [
+ -73.395878,
+ 43.903044
+ ],
+ [
+ -73.383491,
+ 43.890951
+ ],
+ [
+ -73.376312,
+ 43.880292
+ ],
+ [
+ -73.374051,
+ 43.875563
+ ],
+ [
+ -73.37415,
+ 43.874163
+ ],
+ [
+ -73.379334,
+ 43.864648
+ ],
+ [
+ -73.381501,
+ 43.859235
+ ],
+ [
+ -73.382046,
+ 43.855008
+ ],
+ [
+ -73.3818552426673,
+ 43.8545801920065
+ ],
+ [
+ -73.380987,
+ 43.852633
+ ],
+ [
+ -73.373742,
+ 43.847693
+ ],
+ [
+ -73.372462,
+ 43.846266
+ ],
+ [
+ -73.372247,
+ 43.845337
+ ],
+ [
+ -73.3735534635918,
+ 43.842864601516396
+ ],
+ [
+ -73.373688,
+ 43.84261
+ ],
+ [
+ -73.376598,
+ 43.839357
+ ],
+ [
+ -73.381865,
+ 43.837315
+ ],
+ [
+ -73.388389,
+ 43.832404
+ ],
+ [
+ -73.390194,
+ 43.829364
+ ],
+ [
+ -73.392751,
+ 43.822196
+ ],
+ [
+ -73.392492,
+ 43.820779
+ ],
+ [
+ -73.390302,
+ 43.817371
+ ],
+ [
+ -73.383259,
+ 43.81331
+ ],
+ [
+ -73.380804,
+ 43.810951
+ ],
+ [
+ -73.3793298267232,
+ 43.808476322237
+ ],
+ [
+ -73.379279,
+ 43.808391
+ ],
+ [
+ -73.37827,
+ 43.805995
+ ],
+ [
+ -73.377232,
+ 43.800565
+ ],
+ [
+ -73.376361,
+ 43.798766
+ ],
+ [
+ -73.368184,
+ 43.793346
+ ],
+ [
+ -73.362498,
+ 43.790211
+ ],
+ [
+ -73.357547,
+ 43.785933
+ ],
+ [
+ -73.355545,
+ 43.778468
+ ],
+ [
+ -73.354758,
+ 43.776721
+ ],
+ [
+ -73.350593,
+ 43.771939
+ ],
+ [
+ -73.350707,
+ 43.770463
+ ],
+ [
+ -73.354597,
+ 43.764167
+ ],
+ [
+ -73.36295115743201,
+ 43.7531814596909
+ ],
+ [
+ -73.369725,
+ 43.744274
+ ],
+ [
+ -73.370287,
+ 43.742269
+ ],
+ [
+ -73.370724,
+ 43.735571
+ ],
+ [
+ -73.369916,
+ 43.728789
+ ],
+ [
+ -73.370612,
+ 43.725329
+ ],
+ [
+ -73.377756,
+ 43.717712
+ ],
+ [
+ -73.382965,
+ 43.714058
+ ],
+ [
+ -73.385883,
+ 43.711336
+ ],
+ [
+ -73.39179,
+ 43.703481
+ ],
+ [
+ -73.3935750235143,
+ 43.699527722367
+ ],
+ [
+ -73.393723,
+ 43.6992
+ ],
+ [
+ -73.395517,
+ 43.696831
+ ],
+ [
+ -73.398332,
+ 43.694625
+ ],
+ [
+ -73.402078,
+ 43.693106
+ ],
+ [
+ -73.404739,
+ 43.690213
+ ],
+ [
+ -73.405243,
+ 43.688367
+ ],
+ [
+ -73.403474,
+ 43.684694
+ ],
+ [
+ -73.404126,
+ 43.681339
+ ],
+ [
+ -73.40739952321769,
+ 43.6734287329369
+ ],
+ [
+ -73.407776,
+ 43.672519
+ ],
+ [
+ -73.408061,
+ 43.669438
+ ],
+ [
+ -73.414546,
+ 43.658209
+ ],
+ [
+ -73.415513,
+ 43.65245
+ ],
+ [
+ -73.418763,
+ 43.64788
+ ],
+ [
+ -73.423539,
+ 43.645676
+ ],
+ [
+ -73.425217,
+ 43.64429
+ ],
+ [
+ -73.426463,
+ 43.642598
+ ],
+ [
+ -73.428583,
+ 43.636543
+ ],
+ [
+ -73.42791,
+ 43.634428
+ ],
+ [
+ -73.418319,
+ 43.623325
+ ],
+ [
+ -73.417668,
+ 43.621687
+ ],
+ [
+ -73.417827,
+ 43.620586
+ ],
+ [
+ -73.423708,
+ 43.612356
+ ],
+ [
+ -73.423815,
+ 43.610989
+ ],
+ [
+ -73.422154,
+ 43.606511
+ ],
+ [
+ -73.421616,
+ 43.603023
+ ],
+ [
+ -73.424977,
+ 43.598775
+ ],
+ [
+ -73.430325,
+ 43.590532
+ ],
+ [
+ -73.431229,
+ 43.588285
+ ],
+ [
+ -73.430947,
+ 43.587036
+ ],
+ [
+ -73.428636,
+ 43.583994
+ ],
+ [
+ -73.4266999562967,
+ 43.58299310563739
+ ],
+ [
+ -73.426663,
+ 43.582974
+ ],
+ [
+ -73.420378,
+ 43.581489
+ ],
+ [
+ -73.416964,
+ 43.57773
+ ],
+ [
+ -73.405629,
+ 43.571179
+ ],
+ [
+ -73.400295,
+ 43.568889
+ ],
+ [
+ -73.398125,
+ 43.568065
+ ],
+ [
+ -73.395767,
+ 43.568087
+ ],
+ [
+ -73.395169,
+ 43.569619
+ ],
+ [
+ -73.39196,
+ 43.569915
+ ],
+ [
+ -73.3918367638903,
+ 43.570102254868004
+ ],
+ [
+ -73.391344,
+ 43.570851
+ ],
+ [
+ -73.391931,
+ 43.572723
+ ],
+ [
+ -73.391427,
+ 43.57361
+ ],
+ [
+ -73.389741,
+ 43.574683
+ ],
+ [
+ -73.38798,
+ 43.574697
+ ],
+ [
+ -73.386126,
+ 43.574799
+ ],
+ [
+ -73.384188,
+ 43.575512
+ ],
+ [
+ -73.383369,
+ 43.57677
+ ],
+ [
+ -73.382549,
+ 43.579193
+ ],
+ [
+ -73.384496,
+ 43.581553
+ ],
+ [
+ -73.385251,
+ 43.583263
+ ],
+ [
+ -73.383426,
+ 43.584727
+ ],
+ [
+ -73.382425,
+ 43.586062
+ ],
+ [
+ -73.38293,
+ 43.587076
+ ],
+ [
+ -73.38432,
+ 43.587334
+ ],
+ [
+ -73.386253,
+ 43.588411
+ ],
+ [
+ -73.387039,
+ 43.589463
+ ],
+ [
+ -73.386282,
+ 43.591252
+ ],
+ [
+ -73.38409,
+ 43.591415
+ ],
+ [
+ -73.382414,
+ 43.591577
+ ],
+ [
+ -73.381715,
+ 43.592963
+ ],
+ [
+ -73.382449,
+ 43.594159
+ ],
+ [
+ -73.383446,
+ 43.596778
+ ],
+ [
+ -73.38349,
+ 43.597366
+ ],
+ [
+ -73.38135,
+ 43.598505
+ ],
+ [
+ -73.380722,
+ 43.598154
+ ],
+ [
+ -73.380271,
+ 43.597905
+ ],
+ [
+ -73.377213,
+ 43.598572
+ ],
+ [
+ -73.377748,
+ 43.599656
+ ],
+ [
+ -73.377395,
+ 43.600421
+ ],
+ [
+ -73.373443,
+ 43.603292
+ ],
+ [
+ -73.372469,
+ 43.604848
+ ],
+ [
+ -73.372375,
+ 43.606014
+ ],
+ [
+ -73.376036,
+ 43.612596
+ ],
+ [
+ -73.374557,
+ 43.614677
+ ],
+ [
+ -73.369933,
+ 43.619093
+ ],
+ [
+ -73.36987,
+ 43.619711
+ ],
+ [
+ -73.372486,
+ 43.622751
+ ],
+ [
+ -73.371889,
+ 43.624489
+ ],
+ [
+ -73.368899,
+ 43.62471
+ ],
+ [
+ -73.367167,
+ 43.623622
+ ],
+ [
+ -73.365562,
+ 43.62344
+ ],
+ [
+ -73.35911,
+ 43.624598
+ ],
+ [
+ -73.358593,
+ 43.625065
+ ],
+ [
+ -73.347621,
+ 43.622509
+ ],
+ [
+ -73.342181,
+ 43.62607
+ ],
+ [
+ -73.32813999187539,
+ 43.625917749273
+ ],
+ [
+ -73.327702,
+ 43.625913
+ ],
+ [
+ -73.323893,
+ 43.627629
+ ],
+ [
+ -73.317566,
+ 43.627355
+ ],
+ [
+ -73.312809,
+ 43.624602
+ ],
+ [
+ -73.310606,
+ 43.624114
+ ],
+ [
+ -73.307682,
+ 43.627492
+ ],
+ [
+ -73.306234,
+ 43.628018
+ ],
+ [
+ -73.304125,
+ 43.627057
+ ],
+ [
+ -73.302552,
+ 43.625708
+ ],
+ [
+ -73.302076,
+ 43.624364
+ ],
+ [
+ -73.3020153835993,
+ 43.623905129446996
+ ],
+ [
+ -73.300285,
+ 43.610806
+ ],
+ [
+ -73.29802,
+ 43.610028
+ ],
+ [
+ -73.293741,
+ 43.605203
+ ],
+ [
+ -73.292232,
+ 43.60255
+ ],
+ [
+ -73.292202,
+ 43.59816
+ ],
+ [
+ -73.2925027173177,
+ 43.5960017633574
+ ],
+ [
+ -73.292801,
+ 43.593861
+ ],
+ [
+ -73.293242,
+ 43.592558
+ ],
+ [
+ -73.296924,
+ 43.587323
+ ],
+ [
+ -73.292364,
+ 43.585104
+ ],
+ [
+ -73.292113,
+ 43.584509
+ ],
+ [
+ -73.29444,
+ 43.582494
+ ],
+ [
+ -73.295344,
+ 43.580235
+ ],
+ [
+ -73.294621,
+ 43.57897
+ ],
+ [
+ -73.293536,
+ 43.578518
+ ],
+ [
+ -73.2898626413657,
+ 43.57883916331289
+ ],
+ [
+ -73.284912,
+ 43.579272
+ ],
+ [
+ -73.281296,
+ 43.577579
+ ],
+ [
+ -73.280952,
+ 43.575407
+ ],
+ [
+ -73.279726,
+ 43.574241
+ ],
+ [
+ -73.26938,
+ 43.571973
+ ],
+ [
+ -73.264099,
+ 43.568884
+ ],
+ [
+ -73.258631,
+ 43.564949
+ ],
+ [
+ -73.252602,
+ 43.556851
+ ],
+ [
+ -73.248641,
+ 43.553857
+ ],
+ [
+ -73.24842,
+ 43.552577
+ ],
+ [
+ -73.250408,
+ 43.550425
+ ],
+ [
+ -73.250132,
+ 43.543429
+ ],
+ [
+ -73.247812,
+ 43.542814
+ ],
+ [
+ -73.246585,
+ 43.541855
+ ],
+ [
+ -73.2455893651413,
+ 43.540336234961295
+ ],
+ [
+ -73.242042,
+ 43.534925
+ ],
+ [
+ -73.241589,
+ 43.534973
+ ],
+ [
+ -73.24139,
+ 43.532345
+ ],
+ [
+ -73.241891,
+ 43.529418
+ ],
+ [
+ -73.243366,
+ 43.527726
+ ],
+ [
+ -73.246821,
+ 43.52578
+ ],
+ [
+ -73.247698,
+ 43.523173
+ ],
+ [
+ -73.247631,
+ 43.51924
+ ],
+ [
+ -73.24672,
+ 43.518875
+ ],
+ [
+ -73.247061,
+ 43.514919
+ ],
+ [
+ -73.2470702429082,
+ 43.5146122182187
+ ],
+ [
+ -73.2471365508732,
+ 43.5124113875836
+ ],
+ [
+ -73.24775540816779,
+ 43.4918708674104
+ ],
+ [
+ -73.248401,
+ 43.470443
+ ],
+ [
+ -73.2487638638259,
+ 43.4618122044894
+ ],
+ [
+ -73.2497655837699,
+ 43.4379860763965
+ ],
+ [
+ -73.2505637947613,
+ 43.419000453282194
+ ],
+ [
+ -73.25099646554641,
+ 43.408709283967696
+ ],
+ [
+ -73.2511034124067,
+ 43.4061655294903
+ ],
+ [
+ -73.25145047737449,
+ 43.397910513278696
+ ],
+ [
+ -73.252582,
+ 43.370997
+ ],
+ [
+ -73.252674,
+ 43.370285
+ ],
+ [
+ -73.252832,
+ 43.363493
+ ],
+ [
+ -73.253084,
+ 43.354714
+ ],
+ [
+ -73.2531453878036,
+ 43.3529949074009
+ ],
+ [
+ -73.25315693018149,
+ 43.3526716768029
+ ],
+ [
+ -73.2545139435998,
+ 43.3146701262092
+ ],
+ [
+ -73.2557857927449,
+ 43.2790535000319
+ ],
+ [
+ -73.256493,
+ 43.259249
+ ],
+ [
+ -73.2586680648889,
+ 43.230552806826
+ ],
+ [
+ -73.258718,
+ 43.229894
+ ],
+ [
+ -73.25938653218309,
+ 43.2168596701502
+ ],
+ [
+ -73.26079290646149,
+ 43.1894396794612
+ ],
+ [
+ -73.2618094807796,
+ 43.169619594035595
+ ],
+ [
+ -73.2641800346799,
+ 43.1234010540115
+ ],
+ [
+ -73.2650637774847,
+ 43.1061707762313
+ ],
+ [
+ -73.265574,
+ 43.096223
+ ],
+ [
+ -73.266206375905,
+ 43.0871568404487
+ ],
+ [
+ -73.26978,
+ 43.035923
+ ],
+ [
+ -73.2700347484158,
+ 43.0307156692348
+ ],
+ [
+ -73.27067815325411,
+ 43.017563784469495
+ ],
+ [
+ -73.27334370780089,
+ 42.9630769914709
+ ],
+ [
+ -73.274294,
+ 42.943652
+ ],
+ [
+ -73.274393,
+ 42.942482
+ ],
+ [
+ -73.274466,
+ 42.940361
+ ],
+ [
+ -73.27464979158489,
+ 42.934439009859396
+ ],
+ [
+ -73.275804,
+ 42.897249
+ ],
+ [
+ -73.2784862199926,
+ 42.837566099299195
+ ],
+ [
+ -73.2784875592411,
+ 42.8375362992698
+ ],
+ [
+ -73.278673,
+ 42.83341
+ ],
+ [
+ -73.284311,
+ 42.834954
+ ],
+ [
+ -73.285388,
+ 42.834093
+ ],
+ [
+ -73.287063,
+ 42.82014
+ ],
+ [
+ -73.28375,
+ 42.813864
+ ],
+ [
+ -73.285238923874,
+ 42.8105108996947
+ ],
+ [
+ -73.286337,
+ 42.808038
+ ],
+ [
+ -73.2893047875288,
+ 42.8040968400041
+ ],
+ [
+ -73.290944,
+ 42.80192
+ ],
+ [
+ -73.276421,
+ 42.746019
+ ],
+ [
+ -73.264957,
+ 42.74594
+ ],
+ [
+ -73.27315372266389,
+ 42.7238557433838
+ ],
+ [
+ -73.2741413047293,
+ 42.7211949219
+ ],
+ [
+ -73.30700407618059,
+ 42.6326534514115
+ ],
+ [
+ -73.3125496783094,
+ 42.6177120528152
+ ],
+ [
+ -73.3416444868655,
+ 42.5393225251104
+ ],
+ [
+ -73.34727785276829,
+ 42.5241446664332
+ ],
+ [
+ -73.352527,
+ 42.510002
+ ],
+ [
+ -73.3820928961709,
+ 42.4294930473095
+ ],
+ [
+ -73.3835563469972,
+ 42.4255080203494
+ ],
+ [
+ -73.38867066531878,
+ 42.4115815555665
+ ],
+ [
+ -73.39154084534601,
+ 42.4037659565842
+ ],
+ [
+ -73.4006261399339,
+ 42.37902638677949
+ ],
+ [
+ -73.410647401743,
+ 42.351738146023294
+ ],
+ [
+ -73.4119754261193,
+ 42.348121889946896
+ ],
+ [
+ -73.4140751008963,
+ 42.342404403275495
+ ],
+ [
+ -73.431085455188,
+ 42.2960846231813
+ ],
+ [
+ -73.4314003439404,
+ 42.295227170272895
+ ],
+ [
+ -73.4428917594207,
+ 42.2639356504791
+ ],
+ [
+ -73.45994457788639,
+ 42.2175002389776
+ ],
+ [
+ -73.47591804393001,
+ 42.1740039412646
+ ],
+ [
+ -73.4829888960403,
+ 42.1547497676471
+ ],
+ [
+ -73.4971652546362,
+ 42.1161470553557
+ ],
+ [
+ -73.508142,
+ 42.086257
+ ],
+ [
+ -73.5030419422981,
+ 42.069692114015
+ ],
+ [
+ -73.496879,
+ 42.049675
+ ],
+ [
+ -73.487314,
+ 42.049638
+ ],
+ [
+ -73.48822382860538,
+ 42.0300472272559
+ ],
+ [
+ -73.489615,
+ 42.000092
+ ],
+ [
+ -73.492975,
+ 41.958524
+ ],
+ [
+ -73.49348450212139,
+ 41.953339471656
+ ],
+ [
+ -73.496527,
+ 41.92238
+ ],
+ [
+ -73.4965646487039,
+ 41.921747111939
+ ],
+ [
+ -73.498304,
+ 41.892508
+ ],
+ [
+ -73.49945941077141,
+ 41.8818986289734
+ ],
+ [
+ -73.5009100939961,
+ 41.86857796678739
+ ],
+ [
+ -73.5009108171378,
+ 41.868571326657005
+ ],
+ [
+ -73.501984,
+ 41.858717
+ ],
+ [
+ -73.504944,
+ 41.824285
+ ],
+ [
+ -73.5049921230769,
+ 41.823900015384595
+ ],
+ [
+ -73.505008,
+ 41.823773
+ ],
+ [
+ -73.5079601692712,
+ 41.7915267620213
+ ],
+ [
+ -73.510961,
+ 41.758749
+ ],
+ [
+ -73.5115449368014,
+ 41.747916972334295
+ ],
+ [
+ -73.51190654632549,
+ 41.741209115662095
+ ],
+ [
+ -73.511921,
+ 41.740941
+ ],
+ [
+ -73.5159914638673,
+ 41.6962864046138
+ ],
+ [
+ -73.5165907759759,
+ 41.689711714211896
+ ],
+ [
+ -73.516785,
+ 41.687581
+ ],
+ [
+ -73.5179500508434,
+ 41.670860790123
+ ],
+ [
+ -73.51823760355249,
+ 41.666733981689404
+ ],
+ [
+ -73.520017,
+ 41.641197
+ ],
+ [
+ -73.521041,
+ 41.619773
+ ],
+ [
+ -73.52572611024829,
+ 41.571718178187396
+ ],
+ [
+ -73.5274208272509,
+ 41.554335593944195
+ ],
+ [
+ -73.530067,
+ 41.527194
+ ],
+ [
+ -73.5306372297182,
+ 41.5202523080875
+ ],
+ [
+ -73.5308863930724,
+ 41.517219117803194
+ ],
+ [
+ -73.532406621006,
+ 41.4987126218851
+ ],
+ [
+ -73.53241775653869,
+ 41.4985770634688
+ ],
+ [
+ -73.533969,
+ 41.479693
+ ],
+ [
+ -73.534055,
+ 41.478968
+ ],
+ [
+ -73.5340642743096,
+ 41.4788793571253
+ ],
+ [
+ -73.53415,
+ 41.47806
+ ],
+ [
+ -73.534269,
+ 41.476911
+ ],
+ [
+ -73.534269,
+ 41.476394
+ ],
+ [
+ -73.534369,
+ 41.475894
+ ],
+ [
+ -73.53475984465959,
+ 41.47066366093001
+ ],
+ [
+ -73.53529546019818,
+ 41.463495977276594
+ ],
+ [
+ -73.535769,
+ 41.457159
+ ],
+ [
+ -73.535857,
+ 41.455709
+ ],
+ [
+ -73.535885,
+ 41.455236
+ ],
+ [
+ -73.53589433801501,
+ 41.455034816626295
+ ],
+ [
+ -73.535986,
+ 41.45306
+ ],
+ [
+ -73.5360668139182,
+ 41.451334972042694
+ ],
+ [
+ -73.536067,
+ 41.451331
+ ],
+ [
+ -73.536969,
+ 41.441094
+ ],
+ [
+ -73.53710227334909,
+ 41.4397068909828
+ ],
+ [
+ -73.5372747912126,
+ 41.4379113250589
+ ],
+ [
+ -73.537469,
+ 41.43589
+ ],
+ [
+ -73.537673,
+ 41.433905
+ ],
+ [
+ -73.541169,
+ 41.405994
+ ],
+ [
+ -73.5412239838369,
+ 41.40527813774089
+ ],
+ [
+ -73.5423794810464,
+ 41.3902341377244
+ ],
+ [
+ -73.5424417770279,
+ 41.3894230749715
+ ],
+ [
+ -73.5434148559124,
+ 41.3767540709835
+ ],
+ [
+ -73.543425,
+ 41.376622
+ ],
+ [
+ -73.54361929444839,
+ 41.3750940374418
+ ],
+ [
+ -73.5437226736843,
+ 41.3742810466284
+ ],
+ [
+ -73.544728,
+ 41.366375
+ ],
+ [
+ -73.5452425041353,
+ 41.3615174507099
+ ],
+ [
+ -73.5485869686171,
+ 41.329941609131396
+ ],
+ [
+ -73.548973,
+ 41.326297
+ ],
+ [
+ -73.549574,
+ 41.315931
+ ],
+ [
+ -73.548929,
+ 41.307598
+ ],
+ [
+ -73.5490532504887,
+ 41.3068534754184
+ ],
+ [
+ -73.5494473159631,
+ 41.304492185449796
+ ],
+ [
+ -73.54994114379718,
+ 41.3015331068529
+ ],
+ [
+ -73.550961,
+ 41.295422
+ ],
+ [
+ -73.5481483879656,
+ 41.292080485325
+ ],
+ [
+ -73.5405370946926,
+ 41.2830379128492
+ ],
+ [
+ -73.5251605899493,
+ 41.2647699058786
+ ],
+ [
+ -73.518384,
+ 41.256719
+ ],
+ [
+ -73.51742744494929,
+ 41.255540325761004
+ ],
+ [
+ -73.5025525269551,
+ 41.237211341315195
+ ],
+ [
+ -73.482709,
+ 41.21276
+ ],
+ [
+ -73.4849111933569,
+ 41.2117775740592
+ ],
+ [
+ -73.4959359310458,
+ 41.206859300983105
+ ],
+ [
+ -73.50394659256919,
+ 41.2032856449013
+ ],
+ [
+ -73.50918279309809,
+ 41.2009497104956
+ ],
+ [
+ -73.5091865006584,
+ 41.2009480565066
+ ],
+ [
+ -73.509487,
+ 41.200814
+ ],
+ [
+ -73.5127650458268,
+ 41.1992931912149
+ ],
+ [
+ -73.514617,
+ 41.198434
+ ],
+ [
+ -73.535995955855,
+ 41.1885508422818
+ ],
+ [
+ -73.55465007369439,
+ 41.1799273346628
+ ],
+ [
+ -73.5647586708229,
+ 41.1752542879337
+ ],
+ [
+ -73.564941,
+ 41.17517
+ ],
+ [
+ -73.5861737573394,
+ 41.1656141219312
+ ],
+ [
+ -73.58745411116449,
+ 41.1650378941317
+ ],
+ [
+ -73.59706988473059,
+ 41.160710280988205
+ ],
+ [
+ -73.61439109108869,
+ 41.152914810371
+ ],
+ [
+ -73.62881485864709,
+ 41.1464233424058
+ ],
+ [
+ -73.632153,
+ 41.144921
+ ],
+ [
+ -73.633975019844,
+ 41.144090804497196
+ ],
+ [
+ -73.639672,
+ 41.141495
+ ],
+ [
+ -73.660504402926,
+ 41.1318478687221
+ ],
+ [
+ -73.6684334021286,
+ 41.128176084123695
+ ],
+ [
+ -73.6959488909347,
+ 41.1154341295047
+ ],
+ [
+ -73.6960060114926,
+ 41.1154076779464
+ ],
+ [
+ -73.727775,
+ 41.100696
+ ],
+ [
+ -73.722575,
+ 41.093596
+ ],
+ [
+ -73.716875,
+ 41.087596
+ ],
+ [
+ -73.70616305989901,
+ 41.074183562832594
+ ],
+ [
+ -73.694273,
+ 41.059296
+ ],
+ [
+ -73.6895100450317,
+ 41.05352745777849
+ ],
+ [
+ -73.687173,
+ 41.050697
+ ],
+ [
+ -73.679973,
+ 41.041797
+ ],
+ [
+ -73.67578635991521,
+ 41.0366413649098
+ ],
+ [
+ -73.6757716832468,
+ 41.0366232913364
+ ],
+ [
+ -73.6722427528981,
+ 41.0322775924543
+ ],
+ [
+ -73.670472,
+ 41.030097
+ ],
+ [
+ -73.66672215108149,
+ 41.0254818013311
+ ],
+ [
+ -73.66655447294119,
+ 41.025275428235304
+ ],
+ [
+ -73.662672,
+ 41.020497
+ ],
+ [
+ -73.6604129558331,
+ 41.0183522375566
+ ],
+ [
+ -73.658679,
+ 41.016706
+ ],
+ [
+ -73.656117,
+ 41.013135
+ ],
+ [
+ -73.65566792918719,
+ 41.012671863164094
+ ],
+ [
+ -73.655331976322,
+ 41.0123253874133
+ ],
+ [
+ -73.655255,
+ 41.012246
+ ],
+ [
+ -73.655241,
+ 41.011852
+ ],
+ [
+ -73.6556887421582,
+ 41.01026045050809
+ ],
+ [
+ -73.656065,
+ 41.008923
+ ],
+ [
+ -73.6579245992895,
+ 41.0051892007126
+ ],
+ [
+ -73.6585107167126,
+ 41.00401236394519
+ ],
+ [
+ -73.6585172688616,
+ 41.003999208203
+ ],
+ [
+ -73.660268,
+ 41.000484
+ ],
+ [
+ -73.659309,
+ 40.997171
+ ],
+ [
+ -73.65950070028201,
+ 40.995525863034
+ ],
+ [
+ -73.659639,
+ 40.994339
+ ],
+ [
+ -73.657228,
+ 40.990914
+ ],
+ [
+ -73.659671,
+ 40.987909
+ ],
+ [
+ -73.6576158881351,
+ 40.98549919431
+ ],
+ [
+ -73.657336,
+ 40.985171
+ ],
+ [
+ -73.6567791025579,
+ 40.9828952328868
+ ],
+ [
+ -73.655972,
+ 40.979597
+ ],
+ [
+ -73.65667186449261,
+ 40.978593837864494
+ ],
+ [
+ -73.659011,
+ 40.975241
+ ],
+ [
+ -73.6597914599349,
+ 40.9696835730133
+ ],
+ [
+ -73.659972,
+ 40.968398
+ ],
+ [
+ -73.662072,
+ 40.966198
+ ],
+ [
+ -73.664472,
+ 40.967198
+ ],
+ [
+ -73.6689548726994,
+ 40.9657477654674
+ ],
+ [
+ -73.671203429036,
+ 40.96502034484529
+ ],
+ [
+ -73.67289748318979,
+ 40.9644723087982
+ ],
+ [
+ -73.678073,
+ 40.962798
+ ],
+ [
+ -73.67903121090049,
+ 40.9602550556872
+ ],
+ [
+ -73.683273,
+ 40.948998
+ ],
+ [
+ -73.686473,
+ 40.945198
+ ],
+ [
+ -73.692678,
+ 40.944206
+ ],
+ [
+ -73.695413,
+ 40.940002
+ ],
+ [
+ -73.697974,
+ 40.939598
+ ],
+ [
+ -73.694236,
+ 40.948521
+ ],
+ [
+ -73.69533955569119,
+ 40.951689542477
+ ],
+ [
+ -73.695424,
+ 40.951932
+ ],
+ [
+ -73.6970726380946,
+ 40.9503235373428
+ ],
+ [
+ -73.701128,
+ 40.946367
+ ],
+ [
+ -73.705918,
+ 40.938217
+ ],
+ [
+ -73.708734,
+ 40.940622
+ ],
+ [
+ -73.708734,
+ 40.944392
+ ],
+ [
+ -73.7134396978873,
+ 40.9439574767488
+ ],
+ [
+ -73.714961,
+ 40.943817
+ ],
+ [
+ -73.720618,
+ 40.940981
+ ],
+ [
+ -73.72080371002791,
+ 40.939499295727096
+ ],
+ [
+ -73.721739,
+ 40.932037
+ ],
+ [
+ -73.727212,
+ 40.927372
+ ],
+ [
+ -73.734353,
+ 40.921536
+ ],
+ [
+ -73.73583,
+ 40.923743
+ ],
+ [
+ -73.737493,
+ 40.928053
+ ],
+ [
+ -73.738647593538,
+ 40.927965567590704
+ ],
+ [
+ -73.742247,
+ 40.927693
+ ],
+ [
+ -73.7430895508809,
+ 40.925511178037404
+ ],
+ [
+ -73.7434935156237,
+ 40.9244650938566
+ ],
+ [
+ -73.743911,
+ 40.923384
+ ],
+ [
+ -73.7438781567425,
+ 40.92213305171129
+ ],
+ [
+ -73.743764,
+ 40.917785
+ ],
+ [
+ -73.74653699755739,
+ 40.91667980745979
+ ],
+ [
+ -73.7475677982101,
+ 40.91626897652029
+ ],
+ [
+ -73.75488486213209,
+ 40.913352722793
+ ],
+ [
+ -73.756776,
+ 40.912599
+ ],
+ [
+ -73.7616868982569,
+ 40.90644384951769
+ ],
+ [
+ -73.76465,
+ 40.90273
+ ],
+ [
+ -73.766558,
+ 40.89731
+ ],
+ [
+ -73.77802325655259,
+ 40.888107541374495
+ ],
+ [
+ -73.781338,
+ 40.885447
+ ],
+ [
+ -73.7835452253621,
+ 40.881039556340504
+ ],
+ [
+ -73.784803,
+ 40.878528
+ ],
+ [
+ -73.78377754459801,
+ 40.8737425414573
+ ],
+ [
+ -73.783366,
+ 40.871822
+ ],
+ [
+ -73.78598,
+ 40.869485
+ ],
+ [
+ -73.791209,
+ 40.868946
+ ],
+ [
+ -73.793111,
+ 40.863554
+ ],
+ [
+ -73.7916621178674,
+ 40.8618558766405
+ ],
+ [
+ -73.7903979349253,
+ 40.8603742250026
+ ],
+ [
+ -73.788786,
+ 40.858485
+ ],
+ [
+ -73.78806,
+ 40.854131
+ ],
+ [
+ -73.784754,
+ 40.851793
+ ],
+ [
+ -73.7845503224974,
+ 40.851442879952
+ ],
+ [
+ -73.7837996691585,
+ 40.8501525126813
+ ],
+ [
+ -73.782174,
+ 40.847358
+ ],
+ [
+ -73.78215411796849,
+ 40.8466849564146
+ ],
+ [
+ -73.782093,
+ 40.844616
+ ],
+ [
+ -73.78222718192339,
+ 40.8427349527882
+ ],
+ [
+ -73.782254,
+ 40.842359
+ ],
+ [
+ -73.781206,
+ 40.838891
+ ],
+ [
+ -73.782577,
+ 40.837601
+ ],
+ [
+ -73.78355658844929,
+ 40.8369889470619
+ ],
+ [
+ -73.783867,
+ 40.836795
+ ],
+ [
+ -73.785399,
+ 40.838004
+ ],
+ [
+ -73.788221,
+ 40.842036
+ ],
+ [
+ -73.7895699824843,
+ 40.8441939896915
+ ],
+ [
+ -73.791044,
+ 40.846552
+ ],
+ [
+ -73.7910205455361,
+ 40.8466260683397
+ ],
+ [
+ -73.789512,
+ 40.85139
+ ],
+ [
+ -73.7921879532588,
+ 40.8557197529014
+ ],
+ [
+ -73.792253,
+ 40.855825
+ ],
+ [
+ -73.79247106279401,
+ 40.8557905540495
+ ],
+ [
+ -73.793785,
+ 40.855583
+ ],
+ [
+ -73.7941162409583,
+ 40.8552594023289
+ ],
+ [
+ -73.797252,
+ 40.852196
+ ],
+ [
+ -73.799543,
+ 40.848027
+ ],
+ [
+ -73.800110788223,
+ 40.8481406616827
+ ],
+ [
+ -73.8004072944909,
+ 40.8482000172664
+ ],
+ [
+ -73.801726,
+ 40.848464
+ ],
+ [
+ -73.80370186327909,
+ 40.8519687297106
+ ],
+ [
+ -73.80547,
+ 40.855105
+ ],
+ [
+ -73.804757,
+ 40.858521
+ ],
+ [
+ -73.80500555752059,
+ 40.8585460300561
+ ],
+ [
+ -73.80758908528439,
+ 40.858806194563
+ ],
+ [
+ -73.8077204350357,
+ 40.8588194216487
+ ],
+ [
+ -73.808322,
+ 40.85888
+ ],
+ [
+ -73.8115185181963,
+ 40.8587455041432
+ ],
+ [
+ -73.8126,
+ 40.8587
+ ],
+ [
+ -73.8126,
+ 40.854386
+ ],
+ [
+ -73.81657942773289,
+ 40.8535006979629
+ ],
+ [
+ -73.816641,
+ 40.853487
+ ],
+ [
+ -73.8161524601055,
+ 40.851023059662595
+ ],
+ [
+ -73.815928,
+ 40.849891
+ ],
+ [
+ -73.8149671041833,
+ 40.84891900981209
+ ],
+ [
+ -73.81281,
+ 40.846737
+ ],
+ [
+ -73.81463653580009,
+ 40.839066078303894
+ ],
+ [
+ -73.8153051029247,
+ 40.8362582898877
+ ],
+ [
+ -73.815574,
+ 40.835129
+ ],
+ [
+ -73.815205,
+ 40.831075
+ ],
+ [
+ -73.8144318178375,
+ 40.8297431494233
+ ],
+ [
+ -73.81312326035459,
+ 40.8274890841813
+ ],
+ [
+ -73.8120889264041,
+ 40.8257073846865
+ ],
+ [
+ -73.811889,
+ 40.825363
+ ],
+ [
+ -73.808084,
+ 40.826335
+ ],
+ [
+ -73.8077608366193,
+ 40.825629133602696
+ ],
+ [
+ -73.8062520401286,
+ 40.8223335598883
+ ],
+ [
+ -73.804518,
+ 40.818546
+ ],
+ [
+ -73.800479,
+ 40.818061
+ ],
+ [
+ -73.7980946346237,
+ 40.8161941184343
+ ],
+ [
+ -73.7977145646232,
+ 40.81589653582189
+ ],
+ [
+ -73.7976000617692,
+ 40.81580688376209
+ ],
+ [
+ -73.797332,
+ 40.815597
+ ],
+ [
+ -73.802618,
+ 40.812305
+ ],
+ [
+ -73.8007922494588,
+ 40.8100607283042
+ ],
+ [
+ -73.800716,
+ 40.809967
+ ],
+ [
+ -73.79723956685969,
+ 40.8091166862044
+ ],
+ [
+ -73.79119,
+ 40.807637
+ ],
+ [
+ -73.7909151941449,
+ 40.8072807960966
+ ],
+ [
+ -73.79087124917369,
+ 40.8072238345364
+ ],
+ [
+ -73.7864224990023,
+ 40.8014573555951
+ ],
+ [
+ -73.78173803222069,
+ 40.7953853403085
+ ],
+ [
+ -73.781369,
+ 40.794907
+ ],
+ [
+ -73.77885,
+ 40.797193
+ ],
+ [
+ -73.775558,
+ 40.795613
+ ],
+ [
+ -73.770293,
+ 40.788376
+ ],
+ [
+ -73.7741389097254,
+ 40.7863202798795
+ ],
+ [
+ -73.774334,
+ 40.786216
+ ],
+ [
+ -73.7740787591547,
+ 40.7859694239389
+ ],
+ [
+ -73.7703387934199,
+ 40.7823564206272
+ ],
+ [
+ -73.7675451454684,
+ 40.7796576099919
+ ],
+ [
+ -73.767441,
+ 40.779557
+ ],
+ [
+ -73.7670348596146,
+ 40.77848043955719
+ ],
+ [
+ -73.7661154058307,
+ 40.7760432340773
+ ],
+ [
+ -73.76554,
+ 40.774518
+ ],
+ [
+ -73.7635865861473,
+ 40.772932960961
+ ],
+ [
+ -73.7635021041273,
+ 40.772864410561596
+ ],
+ [
+ -73.7615885976999,
+ 40.771311753205005
+ ],
+ [
+ -73.7613603814722,
+ 40.771126573996895
+ ],
+ [
+ -73.758885,
+ 40.769118
+ ],
+ [
+ -73.75837938466749,
+ 40.76955555173
+ ],
+ [
+ -73.75587934721929,
+ 40.771719045675596
+ ],
+ [
+ -73.755557,
+ 40.771998
+ ],
+ [
+ -73.753656,
+ 40.773438
+ ],
+ [
+ -73.7542598582417,
+ 40.7742888294776
+ ],
+ [
+ -73.755881,
+ 40.776573
+ ],
+ [
+ -73.75547359639701,
+ 40.777584
+ ],
+ [
+ -73.7554263694168,
+ 40.777701196992304
+ ],
+ [
+ -73.754606,
+ 40.779737
+ ],
+ [
+ -73.7543402603258,
+ 40.7799670361472
+ ],
+ [
+ -73.7530018625745,
+ 40.78112561310049
+ ],
+ [
+ -73.75145101008741,
+ 40.782468100375205
+ ],
+ [
+ -73.751279,
+ 40.782617
+ ],
+ [
+ -73.753418,
+ 40.786756
+ ],
+ [
+ -73.75362885946168,
+ 40.7895764301354
+ ],
+ [
+ -73.7536707014134,
+ 40.7901361029164
+ ],
+ [
+ -73.754131,
+ 40.796293
+ ],
+ [
+ -73.7538270455553,
+ 40.79767379726
+ ],
+ [
+ -73.753418,
+ 40.799532
+ ],
+ [
+ -73.758885,
+ 40.802231
+ ],
+ [
+ -73.763951,
+ 40.806939
+ ],
+ [
+ -73.7645850496246,
+ 40.8085059684556
+ ],
+ [
+ -73.76554,
+ 40.810866
+ ],
+ [
+ -73.76469879608439,
+ 40.8116024554613
+ ],
+ [
+ -73.754032,
+ 40.820941
+ ],
+ [
+ -73.7544,
+ 40.826837
+ ],
+ [
+ -73.75627,
+ 40.830472
+ ],
+ [
+ -73.757221,
+ 40.833888
+ ],
+ [
+ -73.75411878842868,
+ 40.837205274671696
+ ],
+ [
+ -73.753009,
+ 40.838392
+ ],
+ [
+ -73.750566,
+ 40.835867
+ ],
+ [
+ -73.747001,
+ 40.833349
+ ],
+ [
+ -73.742722,
+ 40.832989
+ ],
+ [
+ -73.73892,
+ 40.828313
+ ],
+ [
+ -73.73799285090529,
+ 40.8281920792056
+ ],
+ [
+ -73.732027,
+ 40.827414
+ ],
+ [
+ -73.729412,
+ 40.823817
+ ],
+ [
+ -73.72656,
+ 40.824177
+ ],
+ [
+ -73.722282,
+ 40.822558
+ ],
+ [
+ -73.717053,
+ 40.815723
+ ],
+ [
+ -73.715627,
+ 40.810866
+ ],
+ [
+ -73.7134769110688,
+ 40.8106946022995
+ ],
+ [
+ -73.7119275785962,
+ 40.810571094839396
+ ],
+ [
+ -73.711111,
+ 40.810506
+ ],
+ [
+ -73.709099487568,
+ 40.8126811417743
+ ],
+ [
+ -73.7073987474174,
+ 40.8145202310536
+ ],
+ [
+ -73.70612,
+ 40.815903
+ ],
+ [
+ -73.7059278180664,
+ 40.818589913378794
+ ],
+ [
+ -73.705644,
+ 40.822558
+ ],
+ [
+ -73.704694,
+ 40.829572
+ ],
+ [
+ -73.707250268377,
+ 40.831613787995295
+ ],
+ [
+ -73.708972,
+ 40.832989
+ ],
+ [
+ -73.71325,
+ 40.837845
+ ],
+ [
+ -73.7216378331134,
+ 40.8356776768825
+ ],
+ [
+ -73.722995,
+ 40.835327
+ ],
+ [
+ -73.7271306678063,
+ 40.8335583533325
+ ],
+ [
+ -73.7278790673477,
+ 40.8332382951419
+ ],
+ [
+ -73.728462,
+ 40.832989
+ ],
+ [
+ -73.729888,
+ 40.835867
+ ],
+ [
+ -73.7299211293595,
+ 40.8363184659882
+ ],
+ [
+ -73.730363,
+ 40.84234
+ ],
+ [
+ -73.737009,
+ 40.847777
+ ],
+ [
+ -73.737678,
+ 40.849516
+ ],
+ [
+ -73.730838,
+ 40.852768
+ ],
+ [
+ -73.726675,
+ 40.8568
+ ],
+ [
+ -73.728856682243,
+ 40.861490616822394
+ ],
+ [
+ -73.730675,
+ 40.8654
+ ],
+ [
+ -73.729575,
+ 40.8665
+ ],
+ [
+ -73.721732,
+ 40.865476
+ ],
+ [
+ -73.719474,
+ 40.86685
+ ],
+ [
+ -73.713674,
+ 40.870099
+ ],
+ [
+ -73.675573,
+ 40.856999
+ ],
+ [
+ -73.674984,
+ 40.853127
+ ],
+ [
+ -73.6741088619926,
+ 40.85200922079049
+ ],
+ [
+ -73.6715565138306,
+ 40.848749207299
+ ],
+ [
+ -73.6674200155545,
+ 40.843465821439594
+ ],
+ [
+ -73.6667306746007,
+ 40.842585353467896
+ ],
+ [
+ -73.660485,
+ 40.834608
+ ],
+ [
+ -73.654543,
+ 40.829213
+ ],
+ [
+ -73.6528551668351,
+ 40.8292738715628
+ ],
+ [
+ -73.65255119038281,
+ 40.8292848344482
+ ],
+ [
+ -73.65099051524989,
+ 40.8293411200671
+ ],
+ [
+ -73.649552,
+ 40.829393
+ ],
+ [
+ -73.6524040524256,
+ 40.8346523856588
+ ],
+ [
+ -73.6525381194128,
+ 40.8348996146311
+ ],
+ [
+ -73.653355,
+ 40.836406
+ ],
+ [
+ -73.654227,
+ 40.845928
+ ],
+ [
+ -73.6537979198632,
+ 40.847098292385695
+ ],
+ [
+ -73.652642,
+ 40.850251
+ ],
+ [
+ -73.649812649874,
+ 40.8525438958202
+ ],
+ [
+ -73.649314,
+ 40.852948
+ ],
+ [
+ -73.6493409206019,
+ 40.8529824566279
+ ],
+ [
+ -73.64941937350649,
+ 40.853082871268
+ ],
+ [
+ -73.65145163496629,
+ 40.8556840343987
+ ],
+ [
+ -73.652404,
+ 40.856903
+ ],
+ [
+ -73.654068,
+ 40.862835
+ ],
+ [
+ -73.655872,
+ 40.863899
+ ],
+ [
+ -73.6558698097119,
+ 40.8639198807468
+ ],
+ [
+ -73.654372,
+ 40.878199
+ ],
+ [
+ -73.6479644705579,
+ 40.8836292659589
+ ],
+ [
+ -73.647422,
+ 40.884089
+ ],
+ [
+ -73.641072,
+ 40.892599
+ ],
+ [
+ -73.6398251870373,
+ 40.8965621896623
+ ],
+ [
+ -73.639807,
+ 40.89662
+ ],
+ [
+ -73.633771,
+ 40.898198
+ ],
+ [
+ -73.633134,
+ 40.90269
+ ],
+ [
+ -73.626972,
+ 40.899397
+ ],
+ [
+ -73.62101786155979,
+ 40.8984476059439
+ ],
+ [
+ -73.617571,
+ 40.897898
+ ],
+ [
+ -73.614199,
+ 40.900127
+ ],
+ [
+ -73.613053,
+ 40.902208
+ ],
+ [
+ -73.609636961957,
+ 40.9030335555198
+ ],
+ [
+ -73.608671,
+ 40.903267
+ ],
+ [
+ -73.605786,
+ 40.90207
+ ],
+ [
+ -73.60187,
+ 40.902798
+ ],
+ [
+ -73.6013155818298,
+ 40.903242139631004
+ ],
+ [
+ -73.5984168956415,
+ 40.905564252222796
+ ],
+ [
+ -73.59546505141309,
+ 40.9079289492636
+ ],
+ [
+ -73.59454,
+ 40.90867
+ ],
+ [
+ -73.59084817512239,
+ 40.9089454280946
+ ],
+ [
+ -73.582329,
+ 40.909581
+ ],
+ [
+ -73.5792565998504,
+ 40.9103658945077
+ ],
+ [
+ -73.576109,
+ 40.91117
+ ],
+ [
+ -73.569969,
+ 40.915398
+ ],
+ [
+ -73.566169,
+ 40.915798
+ ],
+ [
+ -73.5586615111867,
+ 40.912165870895805
+ ],
+ [
+ -73.557434,
+ 40.911572
+ ],
+ [
+ -73.54884756746239,
+ 40.9089372138465
+ ],
+ [
+ -73.548068,
+ 40.908698
+ ],
+ [
+ -73.5472024394697,
+ 40.9090125880914
+ ],
+ [
+ -73.538793,
+ 40.912069
+ ],
+ [
+ -73.53106418291951,
+ 40.9135597718327
+ ],
+ [
+ -73.531063,
+ 40.91356
+ ],
+ [
+ -73.52879988068149,
+ 40.9155165155158
+ ],
+ [
+ -73.52752,
+ 40.916623
+ ],
+ [
+ -73.521423,
+ 40.918304
+ ],
+ [
+ -73.521205,
+ 40.914763
+ ],
+ [
+ -73.51545846739549,
+ 40.9129546816274
+ ],
+ [
+ -73.512145,
+ 40.911912
+ ],
+ [
+ -73.51146,
+ 40.909015
+ ],
+ [
+ -73.5110445333908,
+ 40.9089780810612
+ ],
+ [
+ -73.50742,
+ 40.908656
+ ],
+ [
+ -73.50805666206409,
+ 40.90384015411289
+ ],
+ [
+ -73.50837,
+ 40.90147
+ ],
+ [
+ -73.512886,
+ 40.902548
+ ],
+ [
+ -73.517164,
+ 40.901111
+ ],
+ [
+ -73.5192959099472,
+ 40.896716738196695
+ ],
+ [
+ -73.519779,
+ 40.895721
+ ],
+ [
+ -73.521205,
+ 40.890511
+ ],
+ [
+ -73.520254,
+ 40.886738
+ ],
+ [
+ -73.5206361994218,
+ 40.8866824017346
+ ],
+ [
+ -73.526434,
+ 40.885839
+ ],
+ [
+ -73.533089,
+ 40.8853
+ ],
+ [
+ -73.533802,
+ 40.890151
+ ],
+ [
+ -73.528335,
+ 40.892308
+ ],
+ [
+ -73.523582,
+ 40.897877
+ ],
+ [
+ -73.5235763936921,
+ 40.8979172463346
+ ],
+ [
+ -73.522631,
+ 40.904704
+ ],
+ [
+ -73.523582,
+ 40.909554
+ ],
+ [
+ -73.5272584743404,
+ 40.9106978931302
+ ],
+ [
+ -73.527622,
+ 40.910811
+ ],
+ [
+ -73.5287273994458,
+ 40.910549982723495
+ ],
+ [
+ -73.531425,
+ 40.909913
+ ],
+ [
+ -73.5336360508468,
+ 40.9077865017669
+ ],
+ [
+ -73.53404,
+ 40.907398
+ ],
+ [
+ -73.5365187188487,
+ 40.905256780291204
+ ],
+ [
+ -73.537367,
+ 40.904524
+ ],
+ [
+ -73.540337674155,
+ 40.9042689162946
+ ],
+ [
+ -73.544907,
+ 40.9038765607191
+ ],
+ [
+ -73.54601767139609,
+ 40.9037811903888
+ ],
+ [
+ -73.547825,
+ 40.903626
+ ],
+ [
+ -73.547825,
+ 40.903089247524804
+ ],
+ [
+ -73.547825,
+ 40.901111
+ ],
+ [
+ -73.549013,
+ 40.894823
+ ],
+ [
+ -73.547112,
+ 40.889972
+ ],
+ [
+ -73.548063,
+ 40.886378
+ ],
+ [
+ -73.545448,
+ 40.882784
+ ],
+ [
+ -73.5454091130669,
+ 40.8827193157046
+ ],
+ [
+ -73.54456018774569,
+ 40.881307218326
+ ],
+ [
+ -73.541883,
+ 40.876854
+ ],
+ [
+ -73.5416018575091,
+ 40.8768796566742
+ ],
+ [
+ -73.528098,
+ 40.878112
+ ],
+ [
+ -73.521918,
+ 40.873978
+ ],
+ [
+ -73.5210638034874,
+ 40.8740003060166
+ ],
+ [
+ -73.515025,
+ 40.874158
+ ],
+ [
+ -73.510747,
+ 40.875596
+ ],
+ [
+ -73.50679203781749,
+ 40.872762894893604
+ ],
+ [
+ -73.506231,
+ 40.872361
+ ],
+ [
+ -73.505518,
+ 40.875596
+ ],
+ [
+ -73.5058332346258,
+ 40.876310961224696
+ ],
+ [
+ -73.5069597754496,
+ 40.8788659883093
+ ],
+ [
+ -73.507182,
+ 40.87937
+ ],
+ [
+ -73.51146,
+ 40.887995
+ ],
+ [
+ -73.508608,
+ 40.890691
+ ],
+ [
+ -73.508846,
+ 40.893745
+ ],
+ [
+ -73.498863,
+ 40.895182
+ ],
+ [
+ -73.494822,
+ 40.894823
+ ],
+ [
+ -73.4915,
+ 40.890582
+ ],
+ [
+ -73.489594,
+ 40.884581
+ ],
+ [
+ -73.49102,
+ 40.882245
+ ],
+ [
+ -73.4895303911456,
+ 40.879732912058195
+ ],
+ [
+ -73.48793,
+ 40.877034
+ ],
+ [
+ -73.48491580577601,
+ 40.875114420153196
+ ],
+ [
+ -73.483414,
+ 40.874158
+ ],
+ [
+ -73.476521,
+ 40.871462
+ ],
+ [
+ -73.469391,
+ 40.86643
+ ],
+ [
+ -73.4652120581509,
+ 40.8680096294705
+ ],
+ [
+ -73.464637,
+ 40.868227
+ ],
+ [
+ -73.465113,
+ 40.870923
+ ],
+ [
+ -73.470817,
+ 40.875057
+ ],
+ [
+ -73.4710493104906,
+ 40.8757303011896
+ ],
+ [
+ -73.47117032984261,
+ 40.8760810493347
+ ],
+ [
+ -73.47297,
+ 40.881297
+ ],
+ [
+ -73.47318985809129,
+ 40.892633432834
+ ],
+ [
+ -73.473194,
+ 40.892847
+ ],
+ [
+ -73.475333,
+ 40.897518
+ ],
+ [
+ -73.479373,
+ 40.899853
+ ],
+ [
+ -73.485078,
+ 40.908656
+ ],
+ [
+ -73.488643,
+ 40.91602
+ ],
+ [
+ -73.48978161916459,
+ 40.917081325727096
+ ],
+ [
+ -73.4937200079204,
+ 40.9207523629272
+ ],
+ [
+ -73.496642,
+ 40.923476
+ ],
+ [
+ -73.491765,
+ 40.942097
+ ],
+ [
+ -73.485365,
+ 40.946397
+ ],
+ [
+ -73.478365,
+ 40.942297
+ ],
+ [
+ -73.4744102828026,
+ 40.941055838841
+ ],
+ [
+ -73.463708,
+ 40.937697
+ ],
+ [
+ -73.4606026277113,
+ 40.937375485342095
+ ],
+ [
+ -73.4565227209305,
+ 40.936953072275
+ ],
+ [
+ -73.45219211929229,
+ 40.936504703520896
+ ],
+ [
+ -73.44502567033501,
+ 40.9357627253712
+ ],
+ [
+ -73.4375094155852,
+ 40.9349845300857
+ ],
+ [
+ -73.436664,
+ 40.934897
+ ],
+ [
+ -73.429863,
+ 40.929797
+ ],
+ [
+ -73.4296654998471,
+ 40.9282025756888
+ ],
+ [
+ -73.4293168342383,
+ 40.9253877883836
+ ],
+ [
+ -73.428836,
+ 40.921506
+ ],
+ [
+ -73.42883673273269,
+ 40.921504175835004
+ ],
+ [
+ -73.430174,
+ 40.918175
+ ],
+ [
+ -73.435165,
+ 40.914044
+ ],
+ [
+ -73.433976,
+ 40.909015
+ ],
+ [
+ -73.4327551184559,
+ 40.9085387766616
+ ],
+ [
+ -73.426608,
+ 40.906141
+ ],
+ [
+ -73.41615,
+ 40.904344
+ ],
+ [
+ -73.414410058063,
+ 40.9045286930321
+ ],
+ [
+ -73.4044673384789,
+ 40.905584102404006
+ ],
+ [
+ -73.402603,
+ 40.905782
+ ],
+ [
+ -73.396661,
+ 40.909195
+ ],
+ [
+ -73.3923079352455,
+ 40.907324065552594
+ ],
+ [
+ -73.3887848029103,
+ 40.905809833621696
+ ],
+ [
+ -73.384539,
+ 40.903985
+ ],
+ [
+ -73.3844965585989,
+ 40.9039699038878
+ ],
+ [
+ -73.3810380895212,
+ 40.9027397504064
+ ],
+ [
+ -73.380499,
+ 40.902548
+ ],
+ [
+ -73.377884,
+ 40.9065
+ ],
+ [
+ -73.377171,
+ 40.910811
+ ],
+ [
+ -73.376351392213,
+ 40.9119122401963
+ ],
+ [
+ -73.375032,
+ 40.913685
+ ],
+ [
+ -73.37474243696009,
+ 40.9135099625944
+ ],
+ [
+ -73.371467,
+ 40.91153
+ ],
+ [
+ -73.3691852140375,
+ 40.9091351645811
+ ],
+ [
+ -73.367188,
+ 40.907039
+ ],
+ [
+ -73.360942567948,
+ 40.910186003374896
+ ],
+ [
+ -73.359345,
+ 40.910991
+ ],
+ [
+ -73.3584423558074,
+ 40.9113699502034
+ ],
+ [
+ -73.3552888616436,
+ 40.9126938575241
+ ],
+ [
+ -73.355067,
+ 40.912787
+ ],
+ [
+ -73.35355616601329,
+ 40.9163743227654
+ ],
+ [
+ -73.353403,
+ 40.916738
+ ],
+ [
+ -73.35335179746481,
+ 40.91828354207139
+ ],
+ [
+ -73.353165,
+ 40.923922
+ ],
+ [
+ -73.360296,
+ 40.92482
+ ],
+ [
+ -73.368139,
+ 40.929848
+ ],
+ [
+ -73.37622,
+ 40.92913
+ ],
+ [
+ -73.377646,
+ 40.925179
+ ],
+ [
+ -73.3853639444969,
+ 40.9255679278313
+ ],
+ [
+ -73.388342,
+ 40.925718
+ ],
+ [
+ -73.3885425350288,
+ 40.9231455905761
+ ],
+ [
+ -73.38858,
+ 40.922665
+ ],
+ [
+ -73.392383,
+ 40.924281
+ ],
+ [
+ -73.3976964593832,
+ 40.9275525409106
+ ],
+ [
+ -73.3988,
+ 40.928232
+ ],
+ [
+ -73.4014117948236,
+ 40.9237212175965
+ ],
+ [
+ -73.402127,
+ 40.922486
+ ],
+ [
+ -73.4034232118569,
+ 40.9193213973305
+ ],
+ [
+ -73.4046890562032,
+ 40.9162309346287
+ ],
+ [
+ -73.4048275653854,
+ 40.9158927749942
+ ],
+ [
+ -73.405217,
+ 40.914942
+ ],
+ [
+ -73.407356,
+ 40.9162
+ ],
+ [
+ -73.40614463681649,
+ 40.9200126758544
+ ],
+ [
+ -73.406074,
+ 40.920235
+ ],
+ [
+ -73.402963,
+ 40.925097
+ ],
+ [
+ -73.40325986842109,
+ 40.935270246496394
+ ],
+ [
+ -73.4034619146684,
+ 40.9421940758103
+ ],
+ [
+ -73.403462,
+ 40.942197
+ ],
+ [
+ -73.4026417692798,
+ 40.9459195855762
+ ],
+ [
+ -73.400862,
+ 40.953997
+ ],
+ [
+ -73.399762,
+ 40.955197
+ ],
+ [
+ -73.39537439455329,
+ 40.9552605884847
+ ],
+ [
+ -73.39427108146981,
+ 40.9552765785294
+ ],
+ [
+ -73.392862,
+ 40.955297
+ ],
+ [
+ -73.374462,
+ 40.937597
+ ],
+ [
+ -73.365961,
+ 40.931697
+ ],
+ [
+ -73.352761,
+ 40.926697
+ ],
+ [
+ -73.3486076105678,
+ 40.9258893964993
+ ],
+ [
+ -73.3455620015031,
+ 40.9252971947367
+ ],
+ [
+ -73.345561,
+ 40.925297
+ ],
+ [
+ -73.344161,
+ 40.927297
+ ],
+ [
+ -73.34415825324,
+ 40.927297493519895
+ ],
+ [
+ -73.3441559974711,
+ 40.9272978988217
+ ],
+ [
+ -73.3313694374521,
+ 40.929595304340296
+ ],
+ [
+ -73.33136,
+ 40.929597
+ ],
+ [
+ -73.32271763799649,
+ 40.9283828172993
+ ],
+ [
+ -73.319852882753,
+ 40.927980342112896
+ ],
+ [
+ -73.3121927211481,
+ 40.9269041507081
+ ],
+ [
+ -73.2950614460616,
+ 40.92449734365219
+ ],
+ [
+ -73.295059,
+ 40.924497
+ ],
+ [
+ -73.2950206509978,
+ 40.92448342847359
+ ],
+ [
+ -73.29011275717039,
+ 40.9227465485845
+ ],
+ [
+ -73.2809739443006,
+ 40.9195123669086
+ ],
+ [
+ -73.267435,
+ 40.914721
+ ],
+ [
+ -73.2571785173254,
+ 40.912828871676005
+ ],
+ [
+ -73.2448981669736,
+ 40.910563377795896
+ ],
+ [
+ -73.237394,
+ 40.909179
+ ],
+ [
+ -73.237128031936,
+ 40.9090840071887
+ ],
+ [
+ -73.2325631442209,
+ 40.9074536177694
+ ],
+ [
+ -73.2293112754948,
+ 40.9062921845219
+ ],
+ [
+ -73.228384,
+ 40.905961
+ ],
+ [
+ -73.2248907809353,
+ 40.906932465008595
+ ],
+ [
+ -73.173767,
+ 40.92115
+ ],
+ [
+ -73.1491259467761,
+ 40.9288567323448
+ ],
+ [
+ -73.148994,
+ 40.928898
+ ],
+ [
+ -73.1473837128458,
+ 40.9325117839624
+ ],
+ [
+ -73.14624655602638,
+ 40.9350637754291
+ ],
+ [
+ -73.146242,
+ 40.935074
+ ],
+ [
+ -73.1462378803985,
+ 40.935128528925
+ ],
+ [
+ -73.14550781274869,
+ 40.9447920374981
+ ],
+ [
+ -73.14549263609419,
+ 40.9449929226229
+ ],
+ [
+ -73.144673,
+ 40.955842
+ ],
+ [
+ -73.1474803515898,
+ 40.959009524401196
+ ],
+ [
+ -73.148048,
+ 40.95965
+ ],
+ [
+ -73.154446,
+ 40.961658
+ ],
+ [
+ -73.15883961137921,
+ 40.9674733257827
+ ],
+ [
+ -73.159576,
+ 40.968448
+ ],
+ [
+ -73.14800258896489,
+ 40.966049743709696
+ ],
+ [
+ -73.147999,
+ 40.966049
+ ],
+ [
+ -73.1479965549665,
+ 40.9660491750776
+ ],
+ [
+ -73.1379646796719,
+ 40.9667675116061
+ ],
+ [
+ -73.13749995767989,
+ 40.9668007882141
+ ],
+ [
+ -73.137497,
+ 40.966801
+ ],
+ [
+ -73.130275,
+ 40.968928
+ ],
+ [
+ -73.118331,
+ 40.978071
+ ],
+ [
+ -73.1107157743766,
+ 40.972205851343894
+ ],
+ [
+ -73.110368,
+ 40.971938
+ ],
+ [
+ -73.102399,
+ 40.969195
+ ],
+ [
+ -73.10239831166389,
+ 40.969194999364404
+ ],
+ [
+ -73.0948192509271,
+ 40.969188001155004
+ ],
+ [
+ -73.094818,
+ 40.969188
+ ],
+ [
+ -73.09481763319809,
+ 40.96918839059919
+ ],
+ [
+ -73.09356018432139,
+ 40.9705274198887
+ ],
+ [
+ -73.091874,
+ 40.972323
+ ],
+ [
+ -73.086726,
+ 40.972213
+ ],
+ [
+ -73.081582,
+ 40.973058
+ ],
+ [
+ -73.0728457169835,
+ 40.970550326375694
+ ],
+ [
+ -73.0659611548761,
+ 40.968574173041596
+ ],
+ [
+ -73.05915995716329,
+ 40.9666219487277
+ ],
+ [
+ -73.05862633584739,
+ 40.9664687773965
+ ],
+ [
+ -73.0583318613088,
+ 40.9663842510559
+ ],
+ [
+ -73.050081927161,
+ 40.9640161796204
+ ],
+ [
+ -73.0496602809479,
+ 40.963895149763
+ ],
+ [
+ -73.048639,
+ 40.963602
+ ],
+ [
+ -73.0476414163907,
+ 40.963753921678496
+ ],
+ [
+ -73.04474093041328,
+ 40.9641956357304
+ ],
+ [
+ -73.043944,
+ 40.964317
+ ],
+ [
+ -73.0433739253961,
+ 40.9643464894265
+ ],
+ [
+ -73.040445,
+ 40.964498
+ ],
+ [
+ -73.0275774476641,
+ 40.965076135073694
+ ],
+ [
+ -73.0208597030299,
+ 40.9653779612243
+ ],
+ [
+ -73.0081399768402,
+ 40.96594945451589
+ ],
+ [
+ -72.995931,
+ 40.966498
+ ],
+ [
+ -72.9950945589922,
+ 40.9664907779819
+ ],
+ [
+ -72.9840495357432,
+ 40.966395412789005
+ ],
+ [
+ -72.98017967491349,
+ 40.9663619995479
+ ],
+ [
+ -72.9741779201302,
+ 40.9663101790592
+ ],
+ [
+ -72.9590948858007,
+ 40.966179948778496
+ ],
+ [
+ -72.9561779519491,
+ 40.9661547633214
+ ],
+ [
+ -72.955163,
+ 40.966146
+ ],
+ [
+ -72.9548590657224,
+ 40.9661189372077
+ ],
+ [
+ -72.9427072894481,
+ 40.965036923689595
+ ],
+ [
+ -72.9377925404836,
+ 40.9645993066123
+ ],
+ [
+ -72.9248979499642,
+ 40.963451151730496
+ ],
+ [
+ -72.9140126427234,
+ 40.962481906632696
+ ],
+ [
+ -72.9138369550072,
+ 40.9624662631186
+ ],
+ [
+ -72.913834,
+ 40.962466
+ ],
+ [
+ -72.9031546484732,
+ 40.962673041837
+ ],
+ [
+ -72.9029075866861,
+ 40.9626778316527
+ ],
+ [
+ -72.88825,
+ 40.962962
+ ],
+ [
+ -72.8830949704423,
+ 40.9635235814323
+ ],
+ [
+ -72.8692871609872,
+ 40.9650277841383
+ ],
+ [
+ -72.86694950833149,
+ 40.96528244462309
+ ],
+ [
+ -72.8657851663572,
+ 40.9654092863466
+ ],
+ [
+ -72.86498,
+ 40.965497
+ ],
+ [
+ -72.8637985172525,
+ 40.9656683374403
+ ],
+ [
+ -72.8542143462178,
+ 40.9670582242887
+ ],
+ [
+ -72.84232881919759,
+ 40.9687818514686
+ ],
+ [
+ -72.8394815074734,
+ 40.9691947657524
+ ],
+ [
+ -72.833129,
+ 40.970116
+ ],
+ [
+ -72.81564897864129,
+ 40.9682827987784
+ ],
+ [
+ -72.81088579713379,
+ 40.9677832644827
+ ],
+ [
+ -72.80149580489011,
+ 40.966798497651006
+ ],
+ [
+ -72.800528,
+ 40.966697
+ ],
+ [
+ -72.7794640083192,
+ 40.9655945363119
+ ],
+ [
+ -72.774104,
+ 40.965314
+ ],
+ [
+ -72.745656,
+ 40.968445
+ ],
+ [
+ -72.720941,
+ 40.97392
+ ],
+ [
+ -72.7209401235781,
+ 40.9739202676518
+ ],
+ [
+ -72.7096166121984,
+ 40.9773783723157
+ ],
+ [
+ -72.70837494902209,
+ 40.9777575657547
+ ],
+ [
+ -72.708069,
+ 40.977851
+ ],
+ [
+ -72.685761,
+ 40.980288
+ ],
+ [
+ -72.673164,
+ 40.978673
+ ],
+ [
+ -72.65920831726619,
+ 40.980154234808
+ ],
+ [
+ -72.6484517695946,
+ 40.9812959183164
+ ],
+ [
+ -72.648451,
+ 40.981296
+ ],
+ [
+ -72.635562,
+ 40.981957
+ ],
+ [
+ -72.6198279677669,
+ 40.9864014441584
+ ],
+ [
+ -72.619826,
+ 40.986402
+ ],
+ [
+ -72.6052261215531,
+ 40.9911354601127
+ ],
+ [
+ -72.5916829950277,
+ 40.9955263082587
+ ],
+ [
+ -72.585327,
+ 40.997587
+ ],
+ [
+ -72.5825616146843,
+ 40.999241844553396
+ ],
+ [
+ -72.566166685507,
+ 41.0090527953451
+ ],
+ [
+ -72.565406,
+ 41.009508
+ ],
+ [
+ -72.5652418181845,
+ 41.0097278969442
+ ],
+ [
+ -72.560974,
+ 41.015444
+ ],
+ [
+ -72.55907689650338,
+ 41.014871460342796
+ ],
+ [
+ -72.557412,
+ 41.014369
+ ],
+ [
+ -72.5498682802105,
+ 41.0198329325106
+ ],
+ [
+ -72.549853,
+ 41.019844
+ ],
+ [
+ -72.521548,
+ 41.037652
+ ],
+ [
+ -72.52104636044629,
+ 41.0379988021137
+ ],
+ [
+ -72.517981,
+ 41.040118
+ ],
+ [
+ -72.5164701236562,
+ 41.0402612805644
+ ],
+ [
+ -72.5122089999662,
+ 41.040665374658495
+ ],
+ [
+ -72.50964,
+ 41.040909
+ ],
+ [
+ -72.4942800445234,
+ 41.0462787483324
+ ],
+ [
+ -72.49363,
+ 41.046506
+ ],
+ [
+ -72.4896607620274,
+ 41.049108500363396
+ ],
+ [
+ -72.48966,
+ 41.049109
+ ],
+ [
+ -72.4777138644793,
+ 41.052109555166005
+ ],
+ [
+ -72.477306,
+ 41.052212
+ ],
+ [
+ -72.47453608673601,
+ 41.054382639905796
+ ],
+ [
+ -72.459252,
+ 41.06636
+ ],
+ [
+ -72.445242,
+ 41.086116
+ ],
+ [
+ -72.43944475054249,
+ 41.0865065609317
+ ],
+ [
+ -72.41839545831719,
+ 41.0879246526048
+ ],
+ [
+ -72.417945,
+ 41.087955
+ ],
+ [
+ -72.4129875192375,
+ 41.0899318383542
+ ],
+ [
+ -72.3993478839043,
+ 41.0953707609755
+ ],
+ [
+ -72.397,
+ 41.096307
+ ],
+ [
+ -72.39513194491609,
+ 41.0980117869666
+ ],
+ [
+ -72.3876532433519,
+ 41.1048368496016
+ ],
+ [
+ -72.386119,
+ 41.106237
+ ],
+ [
+ -72.382555,
+ 41.114534
+ ],
+ [
+ -72.37551,
+ 41.118835
+ ],
+ [
+ -72.370122,
+ 41.119739
+ ],
+ [
+ -72.362285,
+ 41.125965
+ ],
+ [
+ -72.3608554421104,
+ 41.127734072122095
+ ],
+ [
+ -72.3576246065867,
+ 41.1317322180509
+ ],
+ [
+ -72.356087,
+ 41.133635
+ ],
+ [
+ -72.354123,
+ 41.139952
+ ],
+ [
+ -72.346398,
+ 41.141006
+ ],
+ [
+ -72.3411955028733,
+ 41.1409195821946
+ ],
+ [
+ -72.339234,
+ 41.140887
+ ],
+ [
+ -72.33902124386199,
+ 41.140783243862
+ ],
+ [
+ -72.333351,
+ 41.138018
+ ],
+ [
+ -72.326481,
+ 41.137643
+ ],
+ [
+ -72.321635,
+ 41.138716
+ ],
+ [
+ -72.3194380728434,
+ 41.1407143373813
+ ],
+ [
+ -72.31669,
+ 41.143214
+ ],
+ [
+ -72.312775,
+ 41.148002
+ ],
+ [
+ -72.307525,
+ 41.147011
+ ],
+ [
+ -72.298949,
+ 41.152801
+ ],
+ [
+ -72.291109,
+ 41.155874
+ ],
+ [
+ -72.278789,
+ 41.158722
+ ],
+ [
+ -72.272997,
+ 41.15501
+ ],
+ [
+ -72.2681,
+ 41.154146
+ ],
+ [
+ -72.2455861640335,
+ 41.161142981984796
+ ],
+ [
+ -72.245348,
+ 41.161217
+ ],
+ [
+ -72.2382170743411,
+ 41.159491469859496
+ ],
+ [
+ -72.238211,
+ 41.15949
+ ],
+ [
+ -72.232006,
+ 41.161185
+ ],
+ [
+ -72.237731,
+ 41.156434
+ ],
+ [
+ -72.24258,
+ 41.153296
+ ],
+ [
+ -72.2506558924831,
+ 41.143385631290194
+ ],
+ [
+ -72.251816,
+ 41.141962
+ ],
+ [
+ -72.253572,
+ 41.137138
+ ],
+ [
+ -72.2536849601583,
+ 41.1368342027141
+ ],
+ [
+ -72.254744,
+ 41.133986
+ ],
+ [
+ -72.2608,
+ 41.129785
+ ],
+ [
+ -72.26511169413288,
+ 41.128485708266595
+ ],
+ [
+ -72.265124,
+ 41.128482
+ ],
+ [
+ -72.269346,
+ 41.128154
+ ],
+ [
+ -72.278741,
+ 41.122222
+ ],
+ [
+ -72.2797605124585,
+ 41.1217946057096
+ ],
+ [
+ -72.289306,
+ 41.117793
+ ],
+ [
+ -72.2916166561777,
+ 41.115892789327496
+ ],
+ [
+ -72.294778,
+ 41.113293
+ ],
+ [
+ -72.2973549821362,
+ 41.1128237461049
+ ],
+ [
+ -72.300159400937,
+ 41.1123130772775
+ ],
+ [
+ -72.300374,
+ 41.112274
+ ],
+ [
+ -72.292876,
+ 41.11777
+ ],
+ [
+ -72.2856201606579,
+ 41.1251755254957
+ ],
+ [
+ -72.285508,
+ 41.12529
+ ],
+ [
+ -72.287754296049,
+ 41.1276322543268
+ ],
+ [
+ -72.288598,
+ 41.128512
+ ],
+ [
+ -72.300044,
+ 41.132059
+ ],
+ [
+ -72.30539567718989,
+ 41.1369411281103
+ ],
+ [
+ -72.306381,
+ 41.13784
+ ],
+ [
+ -72.308801,
+ 41.13979
+ ],
+ [
+ -72.312841,
+ 41.140327
+ ],
+ [
+ -72.3169597742727,
+ 41.139465311600304
+ ],
+ [
+ -72.317119,
+ 41.139432
+ ],
+ [
+ -72.3171507707313,
+ 41.139360910281894
+ ],
+ [
+ -72.31725633328121,
+ 41.139124705082594
+ ],
+ [
+ -72.318146,
+ 41.137134
+ ],
+ [
+ -72.3264321162855,
+ 41.132277968626596
+ ],
+ [
+ -72.32663,
+ 41.132162
+ ],
+ [
+ -72.329716,
+ 41.126006
+ ],
+ [
+ -72.335271,
+ 41.120274
+ ],
+ [
+ -72.3369038620252,
+ 41.1173536681502
+ ],
+ [
+ -72.338273,
+ 41.114905
+ ],
+ [
+ -72.3380722979428,
+ 41.114387167948
+ ],
+ [
+ -72.33650518617421,
+ 41.1103438576096
+ ],
+ [
+ -72.335177,
+ 41.106917
+ ],
+ [
+ -72.33517600157589,
+ 41.1069168153403
+ ],
+ [
+ -72.3319080734103,
+ 41.1063124081781
+ ],
+ [
+ -72.329954,
+ 41.105951
+ ],
+ [
+ -72.32425,
+ 41.101652
+ ],
+ [
+ -72.320998,
+ 41.100584
+ ],
+ [
+ -72.320447,
+ 41.094309
+ ],
+ [
+ -72.3173048034641,
+ 41.0887766190627
+ ],
+ [
+ -72.317238,
+ 41.088659
+ ],
+ [
+ -72.308088,
+ 41.086785
+ ],
+ [
+ -72.30181,
+ 41.082371
+ ],
+ [
+ -72.297718,
+ 41.081042
+ ],
+ [
+ -72.2932944866583,
+ 41.0814783789939
+ ],
+ [
+ -72.292163,
+ 41.08159
+ ],
+ [
+ -72.2810149901587,
+ 41.0804666890847
+ ],
+ [
+ -72.2804925294939,
+ 41.0804140441933
+ ],
+ [
+ -72.280373,
+ 41.080402
+ ],
+ [
+ -72.277427,
+ 41.078723
+ ],
+ [
+ -72.276239,
+ 41.076932
+ ],
+ [
+ -72.27684401078639,
+ 41.0757664073895
+ ],
+ [
+ -72.2785730089682,
+ 41.0724353799935
+ ],
+ [
+ -72.278731,
+ 41.072131
+ ],
+ [
+ -72.2806049983214,
+ 41.070302111679396
+ ],
+ [
+ -72.28212079320929,
+ 41.0688228042888
+ ],
+ [
+ -72.283093,
+ 41.067874
+ ],
+ [
+ -72.28190745273001,
+ 41.065820902507596
+ ],
+ [
+ -72.27365982136169,
+ 41.05153788595501
+ ],
+ [
+ -72.273657,
+ 41.051533
+ ],
+ [
+ -72.26527797299559,
+ 41.0454964281177
+ ],
+ [
+ -72.260515,
+ 41.042065
+ ],
+ [
+ -72.2604886625318,
+ 41.0420676099593
+ ],
+ [
+ -72.248668,
+ 41.043239
+ ],
+ [
+ -72.241252,
+ 41.04477
+ ],
+ [
+ -72.229364,
+ 41.044355
+ ],
+ [
+ -72.22114160227031,
+ 41.0417654427069
+ ],
+ [
+ -72.217476,
+ 41.040611
+ ],
+ [
+ -72.209213,
+ 41.034455
+ ],
+ [
+ -72.201859,
+ 41.032275
+ ],
+ [
+ -72.2013321279846,
+ 41.032289179275196
+ ],
+ [
+ -72.190563,
+ 41.032579
+ ],
+ [
+ -72.1876019084419,
+ 41.033812619067696
+ ],
+ [
+ -72.18759507814521,
+ 41.0338154646346
+ ],
+ [
+ -72.183266,
+ 41.035619
+ ],
+ [
+ -72.17952857692309,
+ 41.0384062307692
+ ],
+ [
+ -72.17949,
+ 41.038435
+ ],
+ [
+ -72.174882,
+ 41.046147
+ ],
+ [
+ -72.1670648479109,
+ 41.0507391854729
+ ],
+ [
+ -72.1668201527011,
+ 41.050882931657505
+ ],
+ [
+ -72.162898,
+ 41.053187
+ ],
+ [
+ -72.16037,
+ 41.053827
+ ],
+ [
+ -72.153857,
+ 41.051859
+ ],
+ [
+ -72.1529930158988,
+ 41.0511519095975
+ ],
+ [
+ -72.1502686708668,
+ 41.048922287290296
+ ],
+ [
+ -72.1457746428136,
+ 41.045244344489696
+ ],
+ [
+ -72.145773,
+ 41.045243
+ ],
+ [
+ -72.137297,
+ 41.039684
+ ],
+ [
+ -72.135137,
+ 41.031284
+ ],
+ [
+ -72.1374085506329,
+ 41.02390945886079
+ ],
+ [
+ -72.137409,
+ 41.023908
+ ],
+ [
+ -72.1374070551785,
+ 41.023906490763096
+ ],
+ [
+ -72.126738,
+ 41.015627
+ ],
+ [
+ -72.12167148564569,
+ 41.007892381992
+ ],
+ [
+ -72.1190801372198,
+ 41.00393639000259
+ ],
+ [
+ -72.11650567369931,
+ 41.000006174767
+ ],
+ [
+ -72.116368,
+ 40.999796
+ ],
+ [
+ -72.109008,
+ 40.994084
+ ],
+ [
+ -72.10216,
+ 40.991509
+ ],
+ [
+ -72.095456,
+ 40.991349
+ ],
+ [
+ -72.0921951598993,
+ 40.9926893662619
+ ],
+ [
+ -72.08305268557939,
+ 40.996447374551195
+ ],
+ [
+ -72.083039,
+ 40.996453
+ ],
+ [
+ -72.079951,
+ 41.003429
+ ],
+ [
+ -72.079208,
+ 41.006437
+ ],
+ [
+ -72.076175,
+ 41.009093
+ ],
+ [
+ -72.064981,
+ 41.010679
+ ],
+ [
+ -72.062913,
+ 41.011317
+ ],
+ [
+ -72.06193973458079,
+ 41.0142984070624
+ ],
+ [
+ -72.060812,
+ 41.017753
+ ],
+ [
+ -72.0608113915752,
+ 41.017753003226396
+ ],
+ [
+ -72.05815356266149,
+ 41.017767097363006
+ ],
+ [
+ -72.05648172153909,
+ 41.0177759629288
+ ],
+ [
+ -72.055909,
+ 41.017779
+ ],
+ [
+ -72.0558094711267,
+ 41.0186979490616
+ ],
+ [
+ -72.0555602587498,
+ 41.0209989243675
+ ],
+ [
+ -72.055424,
+ 41.022257
+ ],
+ [
+ -72.05147765345889,
+ 41.022409774602096
+ ],
+ [
+ -72.047468,
+ 41.022565
+ ],
+ [
+ -72.0431240797269,
+ 41.0213069639454
+ ],
+ [
+ -72.041415,
+ 41.020812
+ ],
+ [
+ -72.035792,
+ 41.020759
+ ],
+ [
+ -72.025498,
+ 41.020515
+ ],
+ [
+ -72.0197131727128,
+ 41.0225418500836
+ ],
+ [
+ -72.01693,
+ 41.023517
+ ],
+ [
+ -72.013394,
+ 41.028908
+ ],
+ [
+ -71.99926,
+ 41.039669
+ ],
+ [
+ -71.99922674405069,
+ 41.0397077160077
+ ],
+ [
+ -71.9945651741691,
+ 41.045134635982
+ ],
+ [
+ -71.99281155293491,
+ 41.047176171847504
+ ],
+ [
+ -71.991409,
+ 41.048809
+ ],
+ [
+ -71.981098,
+ 41.048809
+ ],
+ [
+ -71.980033,
+ 41.044504
+ ],
+ [
+ -71.972232,
+ 41.040839
+ ],
+ [
+ -71.963513,
+ 41.042533
+ ],
+ [
+ -71.957256,
+ 41.048278
+ ],
+ [
+ -71.9575389245437,
+ 41.049860865885
+ ],
+ [
+ -71.9580390599741,
+ 41.0526589522593
+ ],
+ [
+ -71.95811667832069,
+ 41.0530932003145
+ ],
+ [
+ -71.958117,
+ 41.053095
+ ],
+ [
+ -71.960355,
+ 41.059878
+ ],
+ [
+ -71.9614169707492,
+ 41.0635201728592
+ ],
+ [
+ -71.9615333841288,
+ 41.0639194283488
+ ],
+ [
+ -71.961563,
+ 41.064021
+ ],
+ [
+ -71.9599838239577,
+ 41.069811312155004
+ ],
+ [
+ -71.959595,
+ 41.071237
+ ],
+ [
+ -71.955203,
+ 41.07307
+ ],
+ [
+ -71.945864,
+ 41.073706
+ ],
+ [
+ -71.93825,
+ 41.077413
+ ],
+ [
+ -71.9368576533046,
+ 41.077642093249004
+ ],
+ [
+ -71.919385,
+ 41.080517
+ ],
+ [
+ -71.91936806820279,
+ 41.0805231537457
+ ],
+ [
+ -71.904329,
+ 41.085989
+ ],
+ [
+ -71.901146,
+ 41.084772
+ ],
+ [
+ -71.899256,
+ 41.080837
+ ],
+ [
+ -71.895496,
+ 41.077381
+ ],
+ [
+ -71.889543,
+ 41.075701
+ ],
+ [
+ -71.879789,
+ 41.076752
+ ],
+ [
+ -71.869558,
+ 41.075046
+ ],
+ [
+ -71.86447,
+ 41.076918
+ ],
+ [
+ -71.857494,
+ 41.073558
+ ],
+ [
+ -71.8562147672476,
+ 41.0705997742601
+ ],
+ [
+ -71.856214,
+ 41.070598
+ ],
+ [
+ -71.85977788554919,
+ 41.0664488153421
+ ],
+ [
+ -71.8611396536935,
+ 41.064863403180695
+ ],
+ [
+ -71.86114,
+ 41.064863
+ ],
+ [
+ -71.86529,
+ 41.062059
+ ],
+ [
+ -71.867218,
+ 41.059206
+ ],
+ [
+ -71.86761235761949,
+ 41.0590071794488
+ ],
+ [
+ -71.870701,
+ 41.05745
+ ],
+ [
+ -71.87391,
+ 41.052278
+ ],
+ [
+ -71.87623048111469,
+ 41.0510522847025
+ ],
+ [
+ -71.880502,
+ 41.048796
+ ],
+ [
+ -71.887611,
+ 41.047446
+ ],
+ [
+ -71.89855904404538,
+ 41.0436000922506
+ ],
+ [
+ -71.898565,
+ 41.043598
+ ],
+ [
+ -71.8990490903817,
+ 41.0430808224734
+ ],
+ [
+ -71.901418,
+ 41.04055
+ ],
+ [
+ -71.903736,
+ 41.040166
+ ],
+ [
+ -71.913462,
+ 41.038345
+ ],
+ [
+ -71.91694,
+ 41.038951
+ ],
+ [
+ -71.935689,
+ 41.034182
+ ],
+ [
+ -71.9462214908485,
+ 41.030786831311396
+ ],
+ [
+ -71.9516212997593,
+ 41.0290461925203
+ ],
+ [
+ -71.958819,
+ 41.026726
+ ],
+ [
+ -72.01169360571001,
+ 41.00662423497509
+ ],
+ [
+ -72.0265680440593,
+ 41.0009692998591
+ ],
+ [
+ -72.029357,
+ 40.999909
+ ],
+ [
+ -72.1028237867078,
+ 40.9758860143334
+ ],
+ [
+ -72.10986828392289,
+ 40.9735825264144
+ ],
+ [
+ -72.114448,
+ 40.972085
+ ],
+ [
+ -72.1197597431663,
+ 40.970136730345196
+ ],
+ [
+ -72.1489008783076,
+ 40.959448188462495
+ ],
+ [
+ -72.15496830047509,
+ 40.9572227468096
+ ],
+ [
+ -72.18969460981171,
+ 40.9444856447725
+ ],
+ [
+ -72.1948683657152,
+ 40.9425879868261
+ ],
+ [
+ -72.2292221710742,
+ 40.9299875137963
+ ],
+ [
+ -72.2293037719885,
+ 40.9299575837752
+ ],
+ [
+ -72.236045,
+ 40.927485
+ ],
+ [
+ -72.2428424443515,
+ 40.924657932931495
+ ],
+ [
+ -72.245406279007,
+ 40.923591630340596
+ ],
+ [
+ -72.2456102523982,
+ 40.923506797508196
+ ],
+ [
+ -72.258697,
+ 40.918064
+ ],
+ [
+ -72.2609436711011,
+ 40.91720832917719
+ ],
+ [
+ -72.274319423961,
+ 40.91211401811
+ ],
+ [
+ -72.2829362483145,
+ 40.9088322003217
+ ],
+ [
+ -72.2900159206159,
+ 40.906135824772896
+ ],
+ [
+ -72.2977096337075,
+ 40.9032055846465
+ ],
+ [
+ -72.3165020434252,
+ 40.8960482768069
+ ],
+ [
+ -72.3268455824814,
+ 40.8921088196384
+ ],
+ [
+ -72.32805675272931,
+ 40.891647531360896
+ ],
+ [
+ -72.3400298144645,
+ 40.887087451525
+ ],
+ [
+ -72.340031,
+ 40.887087
+ ],
+ [
+ -72.34830256527069,
+ 40.8840600152137
+ ],
+ [
+ -72.3517589643456,
+ 40.8827951436843
+ ],
+ [
+ -72.3550771239581,
+ 40.8815808609776
+ ],
+ [
+ -72.38460499489419,
+ 40.870775117062195
+ ],
+ [
+ -72.39585,
+ 40.86666
+ ],
+ [
+ -72.469996,
+ 40.84274
+ ],
+ [
+ -72.4711866175009,
+ 40.8421875139956
+ ],
+ [
+ -72.474097,
+ 40.840837
+ ],
+ [
+ -72.476031442202,
+ 40.8404310222912
+ ],
+ [
+ -72.484332,
+ 40.838689
+ ],
+ [
+ -72.48434406223049,
+ 40.8386855565878
+ ],
+ [
+ -72.50662445835451,
+ 40.8323251584619
+ ],
+ [
+ -72.5405869396747,
+ 40.8226298684258
+ ],
+ [
+ -72.547551925177,
+ 40.82064156981169
+ ],
+ [
+ -72.54869177129109,
+ 40.8203161772537
+ ],
+ [
+ -72.5662569875928,
+ 40.8153018243569
+ ],
+ [
+ -72.573441,
+ 40.813251
+ ],
+ [
+ -72.574305671977,
+ 40.8130127452078
+ ],
+ [
+ -72.5963186574987,
+ 40.8069472088752
+ ],
+ [
+ -72.61423416811779,
+ 40.802010705352295
+ ],
+ [
+ -72.6176717459706,
+ 40.8010635029231
+ ],
+ [
+ -72.6252049975592,
+ 40.798987763984
+ ],
+ [
+ -72.6308952871661,
+ 40.7974198413449
+ ],
+ [
+ -72.66243989795178,
+ 40.7887279270824
+ ],
+ [
+ -72.663082,
+ 40.788551
+ ],
+ [
+ -72.6782030584063,
+ 40.7845997797604
+ ],
+ [
+ -72.6802257382829,
+ 40.784071241780296
+ ],
+ [
+ -72.6803539756678,
+ 40.784037732608
+ ],
+ [
+ -72.6954038476875,
+ 40.780105113784
+ ],
+ [
+ -72.7280817997418,
+ 40.7715661754321
+ ],
+ [
+ -72.745208,
+ 40.767091
+ ],
+ [
+ -72.753112,
+ 40.763571
+ ],
+ [
+ -72.757176,
+ 40.764371
+ ],
+ [
+ -72.768152,
+ 40.761587
+ ],
+ [
+ -72.78393320513969,
+ 40.75683247428609
+ ],
+ [
+ -72.8078273390868,
+ 40.7496337037705
+ ],
+ [
+ -72.863164,
+ 40.732962
+ ],
+ [
+ -72.87286853017079,
+ 40.7297815644669
+ ],
+ [
+ -72.923214,
+ 40.713282
+ ],
+ [
+ -73.012545,
+ 40.679651
+ ],
+ [
+ -73.018681309797,
+ 40.6777298770309
+ ],
+ [
+ -73.0240672529888,
+ 40.6760436748151
+ ],
+ [
+ -73.054963,
+ 40.666371
+ ],
+ [
+ -73.085456,
+ 40.658738
+ ],
+ [
+ -73.1452311601653,
+ 40.6454230429862
+ ],
+ [
+ -73.154421,
+ 40.643376
+ ],
+ [
+ -73.15673223350969,
+ 40.642967290246496
+ ],
+ [
+ -73.15814063277621,
+ 40.642718234270696
+ ],
+ [
+ -73.167614,
+ 40.641043
+ ],
+ [
+ -73.20844,
+ 40.630884
+ ],
+ [
+ -73.23914,
+ 40.6251
+ ],
+ [
+ -73.262348,
+ 40.621962
+ ],
+ [
+ -73.2644769768046,
+ 40.621903710270004
+ ],
+ [
+ -73.306396,
+ 40.620756
+ ],
+ [
+ -73.3114,
+ 40.622118
+ ],
+ [
+ -73.31683140460309,
+ 40.6261314359676
+ ],
+ [
+ -73.326262,
+ 40.6331
+ ],
+ [
+ -73.341766,
+ 40.6327
+ ],
+ [
+ -73.351465,
+ 40.6305
+ ],
+ [
+ -73.392121,
+ 40.618174
+ ],
+ [
+ -73.417311,
+ 40.611128
+ ],
+ [
+ -73.4237926181023,
+ 40.609632588866
+ ],
+ [
+ -73.450369,
+ 40.603501
+ ],
+ [
+ -73.4763963559211,
+ 40.59889991557309
+ ],
+ [
+ -73.484915,
+ 40.597394
+ ],
+ [
+ -73.48491678157289,
+ 40.597393644699295
+ ],
+ [
+ -73.4938101801929,
+ 40.5956200262591
+ ],
+ [
+ -73.497215,
+ 40.594941
+ ],
+ [
+ -73.5115132067146,
+ 40.5927764729348
+ ],
+ [
+ -73.515308,
+ 40.592202
+ ],
+ [
+ -73.5282307686518,
+ 40.58937842874629
+ ],
+ [
+ -73.549121,
+ 40.584814
+ ],
+ [
+ -73.573478,
+ 40.578006
+ ],
+ [
+ -73.570083,
+ 40.584012
+ ],
+ [
+ -73.57441391082509,
+ 40.5849593208836
+ ],
+ [
+ -73.578303,
+ 40.58581
+ ],
+ [
+ -73.5817648200207,
+ 40.5856090127794
+ ],
+ [
+ -73.583453,
+ 40.585511
+ ],
+ [
+ -73.59257,
+ 40.585592
+ ],
+ [
+ -73.598995,
+ 40.586791
+ ],
+ [
+ -73.610873,
+ 40.587703
+ ],
+ [
+ -73.62795808146,
+ 40.584926510688796
+ ],
+ [
+ -73.63740474743351,
+ 40.583391337025
+ ],
+ [
+ -73.640902,
+ 40.582823
+ ],
+ [
+ -73.64660632297239,
+ 40.5828042227761
+ ],
+ [
+ -73.646674,
+ 40.582804
+ ],
+ [
+ -73.65816234409058,
+ 40.5829739517314
+ ],
+ [
+ -73.66230025185091,
+ 40.58303516547839
+ ],
+ [
+ -73.6667360210262,
+ 40.58310078561
+ ],
+ [
+ -73.6725367515663,
+ 40.583186598168396
+ ],
+ [
+ -73.6778427534928,
+ 40.583265092005895
+ ],
+ [
+ -73.6783117067686,
+ 40.5832720294219
+ ],
+ [
+ -73.6811804537906,
+ 40.583314467959504
+ ],
+ [
+ -73.68691714514719,
+ 40.5833993331604
+ ],
+ [
+ -73.6903105595559,
+ 40.5834495333154
+ ],
+ [
+ -73.6936729769446,
+ 40.58349927491889
+ ],
+ [
+ -73.6970669240198,
+ 40.5835494829538
+ ],
+ [
+ -73.7011380046108,
+ 40.583609708099395
+ ],
+ [
+ -73.705146,
+ 40.583669
+ ],
+ [
+ -73.706140573289,
+ 40.5837574825882
+ ],
+ [
+ -73.71776875084079,
+ 40.58479198779501
+ ],
+ [
+ -73.729841,
+ 40.585866
+ ],
+ [
+ -73.7362169852796,
+ 40.58632515036069
+ ],
+ [
+ -73.74012941277779,
+ 40.586606893874595
+ ],
+ [
+ -73.742686,
+ 40.586791
+ ],
+ [
+ -73.754776,
+ 40.584404
+ ],
+ [
+ -73.7548889533319,
+ 40.585891180684
+ ],
+ [
+ -73.7552665240504,
+ 40.5908624008346
+ ],
+ [
+ -73.755269,
+ 40.590895
+ ],
+ [
+ -73.7560282162845,
+ 40.590889747778895
+ ],
+ [
+ -73.76362228847199,
+ 40.5908372123591
+ ],
+ [
+ -73.76375782345809,
+ 40.5908362747347
+ ],
+ [
+ -73.7675356211426,
+ 40.590810140115195
+ ],
+ [
+ -73.7696436778067,
+ 40.5907955566824
+ ],
+ [
+ -73.774928,
+ 40.590759
+ ],
+ [
+ -73.7853023473749,
+ 40.588762557547795
+ ],
+ [
+ -73.7857591786223,
+ 40.5886746448085
+ ],
+ [
+ -73.7884401183853,
+ 40.588158723974004
+ ],
+ [
+ -73.7884870692082,
+ 40.588149688743904
+ ],
+ [
+ -73.79089076184918,
+ 40.587687121426896
+ ],
+ [
+ -73.79559440271939,
+ 40.586781951397896
+ ],
+ [
+ -73.8014345864318,
+ 40.585658064731
+ ],
+ [
+ -73.806834,
+ 40.584619
+ ],
+ [
+ -73.8098659330526,
+ 40.58380334469479
+ ],
+ [
+ -73.815495604297,
+ 40.5822888418555
+ ],
+ [
+ -73.8210851044268,
+ 40.5807851459114
+ ],
+ [
+ -73.82949666128839,
+ 40.5785222559136
+ ],
+ [
+ -73.834408,
+ 40.577201
+ ],
+ [
+ -73.8355312954688,
+ 40.576809433605796
+ ],
+ [
+ -73.8370403194943,
+ 40.576283407183695
+ ],
+ [
+ -73.83891901648259,
+ 40.575628517507795
+ ],
+ [
+ -73.84140129860909,
+ 40.574763225793696
+ ],
+ [
+ -73.84380416067549,
+ 40.573925618894
+ ],
+ [
+ -73.8470497674191,
+ 40.572794242008
+ ],
+ [
+ -73.85704282871019,
+ 40.5693107890027
+ ],
+ [
+ -73.8629720953609,
+ 40.5672439226909
+ ],
+ [
+ -73.8725865174353,
+ 40.563892458460494
+ ],
+ [
+ -73.878681,
+ 40.561768
+ ],
+ [
+ -73.87920281584479,
+ 40.561637464268095
+ ],
+ [
+ -73.87932164844759,
+ 40.5616077374958
+ ],
+ [
+ -73.88237072057389,
+ 40.560844991662194
+ ],
+ [
+ -73.89623,
+ 40.557378
+ ],
+ [
+ -73.9010160660574,
+ 40.5568532568131
+ ],
+ [
+ -73.905141,
+ 40.556401
+ ],
+ [
+ -73.917774,
+ 40.55285
+ ],
+ [
+ -73.940591,
+ 40.542896
+ ],
+ [
+ -73.940573712484,
+ 40.54348327300101
+ ],
+ [
+ -73.940247,
+ 40.554582
+ ],
+ [
+ -73.937068,
+ 40.55727
+ ],
+ [
+ -73.9369713506784,
+ 40.55759793049901
+ ],
+ [
+ -73.9354125461796,
+ 40.562886943694195
+ ],
+ [
+ -73.93426954323711,
+ 40.5667651450013
+ ],
+ [
+ -73.9326458019924,
+ 40.5722744881389
+ ],
+ [
+ -73.9316439833185,
+ 40.5756736521711
+ ],
+ [
+ -73.931559,
+ 40.575962
+ ],
+ [
+ -73.937665,
+ 40.575434
+ ],
+ [
+ -73.946295,
+ 40.5756
+ ],
+ [
+ -73.9524802181286,
+ 40.574840135519494
+ ],
+ [
+ -73.955721,
+ 40.574442
+ ],
+ [
+ -73.95942223594291,
+ 40.5740168643515
+ ],
+ [
+ -73.9820844563704,
+ 40.5714138101483
+ ],
+ [
+ -73.9907535993926,
+ 40.570418045004494
+ ],
+ [
+ -73.991346,
+ 40.57035
+ ],
+ [
+ -74.0020519616197,
+ 40.5706228970609
+ ],
+ [
+ -74.002056,
+ 40.570623
+ ],
+ [
+ -74.0022836477874,
+ 40.5707383658818
+ ],
+ [
+ -74.005673,
+ 40.572456
+ ],
+ [
+ -74.0087571397769,
+ 40.5734625108864
+ ],
+ [
+ -74.0107121806173,
+ 40.5741005396502
+ ],
+ [
+ -74.012022,
+ 40.574528
+ ],
+ [
+ -74.0123228616252,
+ 40.575652678827
+ ],
+ [
+ -74.012996,
+ 40.578169
+ ],
+ [
+ -74.0120188013172,
+ 40.579099473126
+ ],
+ [
+ -74.009608,
+ 40.581395
+ ],
+ [
+ -74.005002,
+ 40.58228
+ ],
+ [
+ -74.00404540894819,
+ 40.5821762351653
+ ],
+ [
+ -74.0031775057949,
+ 40.5820820906225
+ ],
+ [
+ -74.001674,
+ 40.581919
+ ],
+ [
+ -74.00167301890579,
+ 40.581920788762794
+ ],
+ [
+ -74.0013361867149,
+ 40.5825349121006
+ ],
+ [
+ -74.000486,
+ 40.584085
+ ],
+ [
+ -74.000586991197,
+ 40.5870718783011
+ ],
+ [
+ -74.000724,
+ 40.591124
+ ],
+ [
+ -74.00130241758559,
+ 40.5921713497932
+ ],
+ [
+ -74.00136505929069,
+ 40.59228477611101
+ ],
+ [
+ -74.0022422905347,
+ 40.593873192481595
+ ],
+ [
+ -74.0022738340043,
+ 40.5939303087367
+ ],
+ [
+ -74.00320438943919,
+ 40.595615280056
+ ],
+ [
+ -74.003281,
+ 40.595754
+ ],
+ [
+ -74.0042168208041,
+ 40.5963703319488
+ ],
+ [
+ -74.00572229100179,
+ 40.5973618352118
+ ],
+ [
+ -74.00577945986939,
+ 40.597399486650396
+ ],
+ [
+ -74.0077100448287,
+ 40.5986709706622
+ ],
+ [
+ -74.00790676112359,
+ 40.598800528091196
+ ],
+ [
+ -74.0084384949163,
+ 40.5991507281757
+ ],
+ [
+ -74.009184756705,
+ 40.59964221648259
+ ],
+ [
+ -74.0093058714376,
+ 40.599721982693
+ ],
+ [
+ -74.00932714037779,
+ 40.599735990425394
+ ],
+ [
+ -74.0105327821987,
+ 40.600530026601696
+ ],
+ [
+ -74.0105671795466,
+ 40.6005526807085
+ ],
+ [
+ -74.010926,
+ 40.600789
+ ],
+ [
+ -74.0110494523112,
+ 40.6008156238927
+ ],
+ [
+ -74.0113370651283,
+ 40.6008776508625
+ ],
+ [
+ -74.01160983117059,
+ 40.6009364759568
+ ],
+ [
+ -74.0146169621317,
+ 40.6015849978945
+ ],
+ [
+ -74.0148563837204,
+ 40.6016366318787
+ ],
+ [
+ -74.0150890658452,
+ 40.60168681242101
+ ],
+ [
+ -74.01827563110801,
+ 40.6023740314033
+ ],
+ [
+ -74.0189581790272,
+ 40.602521230612396
+ ],
+ [
+ -74.0196250708203,
+ 40.602665053400095
+ ],
+ [
+ -74.0271720774701,
+ 40.6042926510802
+ ],
+ [
+ -74.0278791387297,
+ 40.6044451368695
+ ],
+ [
+ -74.031384,
+ 40.605201
+ ],
+ [
+ -74.0354949628475,
+ 40.609075003863005
+ ],
+ [
+ -74.0358058157354,
+ 40.6093679389571
+ ],
+ [
+ -74.0363843681629,
+ 40.6099131431883
+ ],
+ [
+ -74.03638844894151,
+ 40.6099169887477
+ ],
+ [
+ -74.0392655790145,
+ 40.6126282788836
+ ],
+ [
+ -74.03959,
+ 40.612934
+ ],
+ [
+ -74.0395989873548,
+ 40.6129719398858
+ ],
+ [
+ -74.0396105002328,
+ 40.613020541202296
+ ],
+ [
+ -74.0396194803355,
+ 40.613058450473694
+ ],
+ [
+ -74.0399350595924,
+ 40.6143906601431
+ ],
+ [
+ -74.040247207532,
+ 40.6157083845955
+ ],
+ [
+ -74.0405657471589,
+ 40.6170530913903
+ ],
+ [
+ -74.0409710419105,
+ 40.6187640327003
+ ],
+ [
+ -74.0410042130619,
+ 40.6189040638579
+ ],
+ [
+ -74.0413991059603,
+ 40.6205710940132
+ ],
+ [
+ -74.0414213288962,
+ 40.6206649075623
+ ],
+ [
+ -74.0416287977179,
+ 40.621540731825895
+ ],
+ [
+ -74.04181921329939,
+ 40.622344566278
+ ],
+ [
+ -74.0418612425826,
+ 40.6225219918099
+ ],
+ [
+ -74.04186498283079,
+ 40.6225377811708
+ ],
+ [
+ -74.042412,
+ 40.624847
+ ],
+ [
+ -74.0420116265256,
+ 40.626048022196
+ ],
+ [
+ -74.0419869662144,
+ 40.626121997079395
+ ],
+ [
+ -74.0419861639864,
+ 40.6261244035665
+ ],
+ [
+ -74.0415843352794,
+ 40.6273297911037
+ ],
+ [
+ -74.0412160016512,
+ 40.6284347016219
+ ],
+ [
+ -74.0410427721954,
+ 40.6289543474893
+ ],
+ [
+ -74.0402915086622,
+ 40.631207953775196
+ ],
+ [
+ -74.0395755857775,
+ 40.6333555467857
+ ],
+ [
+ -74.03942056116,
+ 40.6338205826048
+ ],
+ [
+ -74.0393851747986,
+ 40.63392673300719
+ ],
+ [
+ -74.0387807086057,
+ 40.6357399832871
+ ],
+ [
+ -74.03870402208149,
+ 40.6359700240455
+ ],
+ [
+ -74.038336,
+ 40.637074
+ ],
+ [
+ -74.0374076923077,
+ 40.6384664615385
+ ],
+ [
+ -74.03585910791371,
+ 40.6407893381295
+ ],
+ [
+ -74.03351683155289,
+ 40.6443027526705
+ ],
+ [
+ -74.032066,
+ 40.646479
+ ],
+ [
+ -74.02620732724439,
+ 40.6518050661414
+ ],
+ [
+ -74.018272,
+ 40.659019
+ ],
+ [
+ -74.0186609605392,
+ 40.6625189360408
+ ],
+ [
+ -74.020467,
+ 40.67877
+ ],
+ [
+ -74.0194315835348,
+ 40.679441264418294
+ ],
+ [
+ -74.0152711331479,
+ 40.68213850017109
+ ],
+ [
+ -74.01514529702558,
+ 40.6822200802061
+ ],
+ [
+ -74.012113182521,
+ 40.6841858115303
+ ],
+ [
+ -74.0082201392615,
+ 40.6867096862291
+ ],
+ [
+ -74.007379,
+ 40.687255
+ ],
+ [
+ -74.0073752505717,
+ 40.6872620398502
+ ],
+ [
+ -74.0065840928067,
+ 40.6887475015646
+ ],
+ [
+ -74.0061396893279,
+ 40.6895819044898
+ ],
+ [
+ -74.00550752815289,
+ 40.6907688374433
+ ],
+ [
+ -74.0053513232339,
+ 40.69106212461929
+ ],
+ [
+ -74.0030179672998,
+ 40.695443186222
+ ],
+ [
+ -74.002388,
+ 40.696626
+ ],
+ [
+ -74.0018828543745,
+ 40.697315156889395
+ ],
+ [
+ -74.00074098410501,
+ 40.698872980462404
+ ],
+ [
+ -73.998822,
+ 40.701491
+ ],
+ [
+ -74.0016558967292,
+ 40.7026627125126
+ ],
+ [
+ -74.0037653576436,
+ 40.7035348973466
+ ],
+ [
+ -74.004051,
+ 40.703653
+ ],
+ [
+ -74.0067847421372,
+ 40.701975625768
+ ],
+ [
+ -74.0072294160965,
+ 40.701702781950395
+ ],
+ [
+ -74.009043,
+ 40.70059
+ ],
+ [
+ -74.00988980027171,
+ 40.700493792942005
+ ],
+ [
+ -74.0135324921432,
+ 40.700079937774596
+ ],
+ [
+ -74.013796,
+ 40.70005
+ ],
+ [
+ -74.0142519151327,
+ 40.7003146857495
+ ],
+ [
+ -74.0168,
+ 40.701794
+ ],
+ [
+ -74.01798561601879,
+ 40.7040517156102
+ ],
+ [
+ -74.018073039368,
+ 40.7042181919879
+ ],
+ [
+ -74.0194854329352,
+ 40.70690774995101
+ ],
+ [
+ -74.019526,
+ 40.706985
+ ],
+ [
+ -74.024543,
+ 40.709436
+ ],
+ [
+ -74.02385865547001,
+ 40.7130277101558
+ ],
+ [
+ -74.0233371654942,
+ 40.7157646953441
+ ],
+ [
+ -74.0224656208889,
+ 40.7203389053696
+ ],
+ [
+ -74.0218509332832,
+ 40.7235650284983
+ ],
+ [
+ -74.02153686156879,
+ 40.725213400797195
+ ],
+ [
+ -74.0214927100048,
+ 40.725445125628504
+ ],
+ [
+ -74.021117,
+ 40.727417
+ ],
+ [
+ -74.0210755680795,
+ 40.7275818914723
+ ],
+ [
+ -74.02071541526209,
+ 40.7290152338731
+ ],
+ [
+ -74.0203883683071,
+ 40.730316820990794
+ ],
+ [
+ -74.01977669977019,
+ 40.732751149994
+ ],
+ [
+ -74.01887121687479,
+ 40.7363548064537
+ ],
+ [
+ -74.017789810843,
+ 40.740658604849
+ ],
+ [
+ -74.01692332756079,
+ 40.7441070499749
+ ],
+ [
+ -74.0156108717903,
+ 40.7493303841091
+ ],
+ [
+ -74.013784,
+ 40.756601
+ ],
+ [
+ -74.0098517287783,
+ 40.762584890989594
+ ],
+ [
+ -74.009184,
+ 40.763601
+ ],
+ [
+ -74.00828125206719,
+ 40.7648550996597
+ ],
+ [
+ -74.0043787184341,
+ 40.77027650902949
+ ],
+ [
+ -74.00139463374009,
+ 40.7744220068627
+ ],
+ [
+ -74.00022288810109,
+ 40.7760497988009
+ ],
+ [
+ -73.9976083602156,
+ 40.7796819074023
+ ],
+ [
+ -73.99723790003179,
+ 40.78019655160529
+ ],
+ [
+ -73.9955868235623,
+ 40.782490231118096
+ ],
+ [
+ -73.9946736174299,
+ 40.7837588593345
+ ],
+ [
+ -73.9928571064622,
+ 40.7862823608611
+ ],
+ [
+ -73.9915676124392,
+ 40.788073729145395
+ ],
+ [
+ -73.9912420918403,
+ 40.788525943166
+ ],
+ [
+ -73.989894390288,
+ 40.7903981734938
+ ],
+ [
+ -73.9880545412037,
+ 40.79295409638969
+ ],
+ [
+ -73.9861819941365,
+ 40.7955554434041
+ ],
+ [
+ -73.98482221536119,
+ 40.7974444514401
+ ],
+ [
+ -73.9843088955015,
+ 40.7981575566581
+ ],
+ [
+ -73.9824834097892,
+ 40.800693525922
+ ],
+ [
+ -73.9806163897831,
+ 40.8032871947296
+ ],
+ [
+ -73.97885474255939,
+ 40.8057344794073
+ ],
+ [
+ -73.9771693704015,
+ 40.808075802575196
+ ],
+ [
+ -73.9750969903285,
+ 40.81095475809529
+ ],
+ [
+ -73.97122753768102,
+ 40.81633021127801
+ ],
+ [
+ -73.968082,
+ 40.8207
+ ],
+ [
+ -73.967982575439,
+ 40.8208258025057
+ ],
+ [
+ -73.9659860397118,
+ 40.8233520313851
+ ],
+ [
+ -73.9657062398566,
+ 40.8237060638549
+ ],
+ [
+ -73.9650921290633,
+ 40.8244831020016
+ ],
+ [
+ -73.9636574765412,
+ 40.8262983766213
+ ],
+ [
+ -73.963182,
+ 40.8269
+ ],
+ [
+ -73.96234990397281,
+ 40.8288083941493
+ ],
+ [
+ -73.9614512106068,
+ 40.8308695278475
+ ],
+ [
+ -73.9599182216476,
+ 40.834385404699496
+ ],
+ [
+ -73.95861143270739,
+ 40.837382496725496
+ ],
+ [
+ -73.9576235765217,
+ 40.839648123412296
+ ],
+ [
+ -73.9555356566198,
+ 40.844436722317596
+ ],
+ [
+ -73.953982,
+ 40.848
+ ],
+ [
+ -73.9521001021992,
+ 40.851432705706095
+ ],
+ [
+ -73.952095189942,
+ 40.8514416659872
+ ],
+ [
+ -73.948281,
+ 40.858399
+ ],
+ [
+ -73.94827788810748,
+ 40.8584039729262
+ ],
+ [
+ -73.94572611766459,
+ 40.862481802163394
+ ],
+ [
+ -73.9381535187682,
+ 40.8745831121645
+ ],
+ [
+ -73.938081,
+ 40.874699
+ ],
+ [
+ -73.9334079229381,
+ 40.882074964842694
+ ],
+ [
+ -73.933406,
+ 40.882078
+ ],
+ [
+ -73.9290088898939,
+ 40.8895730740445
+ ],
+ [
+ -73.929006,
+ 40.889578
+ ],
+ [
+ -73.926757656973,
+ 40.895355378598595
+ ],
+ [
+ -73.919705,
+ 40.913478
+ ],
+ [
+ -73.9196864010756,
+ 40.9135352131528
+ ],
+ [
+ -73.91925644253189,
+ 40.9148578317808
+ ],
+ [
+ -73.918405,
+ 40.917477
+ ],
+ [
+ -73.917905,
+ 40.917577
+ ],
+ [
+ -73.91768,
+ 40.919498
+ ],
+ [
+ -73.9176796734955,
+ 40.91949883958301
+ ],
+ [
+ -73.91558,
+ 40.924898
+ ],
+ [
+ -73.912272372207,
+ 40.935498349312496
+ ],
+ [
+ -73.9103956177983,
+ 40.94151300802
+ ],
+ [
+ -73.90728,
+ 40.951498
+ ],
+ [
+ -73.9072570972635,
+ 40.95156203478739
+ ],
+ [
+ -73.9049158705604,
+ 40.9581079754602
+ ],
+ [
+ -73.8989276186366,
+ 40.974850797407
+ ],
+ [
+ -73.896479,
+ 40.981697
+ ],
+ [
+ -73.893979,
+ 40.997197
+ ],
+ [
+ -73.90268,
+ 40.997297
+ ],
+ [
+ -73.90501,
+ 40.997591
+ ],
+ [
+ -73.907054,
+ 40.998476
+ ],
+ [
+ -73.91188,
+ 41.001297
+ ],
+ [
+ -73.9203372461027,
+ 41.0050806926432
+ ],
+ [
+ -73.92209223992629,
+ 41.0058658604317
+ ],
+ [
+ -73.9384366924875,
+ 41.0131782153238
+ ],
+ [
+ -73.94522046194349,
+ 41.0162132101995
+ ],
+ [
+ -73.945287705613,
+ 41.016243294387
+ ],
+ [
+ -73.95191970856911,
+ 41.0192103903529
+ ],
+ [
+ -73.9530653260279,
+ 41.019722928867104
+ ],
+ [
+ -73.95911230141559,
+ 41.0224282889819
+ ],
+ [
+ -73.96664708915749,
+ 41.0257992824
+ ],
+ [
+ -73.96713937443441,
+ 41.026019526219095
+ ],
+ [
+ -73.97737137616639,
+ 41.0305972278974
+ ],
+ [
+ -73.9939572815336,
+ 41.03801760651201
+ ],
+ [
+ -74.01258355443879,
+ 41.046350826440296
+ ],
+ [
+ -74.0135383260931,
+ 41.0467779823301
+ ],
+ [
+ -74.0245669288735,
+ 41.0517120758516
+ ],
+ [
+ -74.0258472191655,
+ 41.052284865729
+ ],
+ [
+ -74.0294705577142,
+ 41.053905913437
+ ],
+ [
+ -74.0372859487235,
+ 41.057402446127
+ ],
+ [
+ -74.041049,
+ 41.059086
+ ],
+ [
+ -74.041054,
+ 41.059088
+ ],
+ [
+ -74.0508612591911,
+ 41.0634371205403
+ ],
+ [
+ -74.0572368208942,
+ 41.0662644228293
+ ],
+ [
+ -74.05723960435219,
+ 41.0662656571797
+ ],
+ [
+ -74.0678918326591,
+ 41.070989487153696
+ ],
+ [
+ -74.0719550301677,
+ 41.0727913499779
+ ],
+ [
+ -74.08171972150689,
+ 41.0771215934074
+ ],
+ [
+ -74.0817250021555,
+ 41.0771239351603
+ ],
+ [
+ -74.09124215134639,
+ 41.0813444037158
+ ],
+ [
+ -74.0912658631398,
+ 41.081354918931694
+ ],
+ [
+ -74.092486,
+ 41.081896
+ ],
+ [
+ -74.0926420257918,
+ 41.081964941629
+ ],
+ [
+ -74.096786,
+ 41.083796
+ ],
+ [
+ -74.0968842207579,
+ 41.083839370011006
+ ],
+ [
+ -74.10378978866919,
+ 41.08688856819659
+ ],
+ [
+ -74.1207999207891,
+ 41.0943995020782
+ ],
+ [
+ -74.12080400750101,
+ 41.094401306592296
+ ],
+ [
+ -74.127243519023,
+ 41.0972447145642
+ ],
+ [
+ -74.1294260249086,
+ 41.0982084141572
+ ],
+ [
+ -74.1425220440736,
+ 41.1039910461419
+ ],
+ [
+ -74.1465813979726,
+ 41.105783480117296
+ ],
+ [
+ -74.1498606761537,
+ 41.107231466613
+ ],
+ [
+ -74.1500574751712,
+ 41.1073183644922
+ ],
+ [
+ -74.1583048714496,
+ 41.110960055674
+ ],
+ [
+ -74.16270126501409,
+ 41.1129013116942
+ ],
+ [
+ -74.18239,
+ 41.121595
+ ],
+ [
+ -74.1953483876671,
+ 41.1268915105055
+ ],
+ [
+ -74.206695222776,
+ 41.1315293275628
+ ],
+ [
+ -74.2132103666368,
+ 41.1341922767499
+ ],
+ [
+ -74.234473,
+ 41.142883
+ ],
+ [
+ -74.2428599745976,
+ 41.14657348743749
+ ],
+ [
+ -74.243189773693,
+ 41.146718607636004
+ ],
+ [
+ -74.2457083939556,
+ 41.1478268662018
+ ],
+ [
+ -74.28003870326089,
+ 41.162933097148795
+ ],
+ [
+ -74.2802374078622,
+ 41.163020532352796
+ ],
+ [
+ -74.301994,
+ 41.172594
+ ],
+ [
+ -74.320995,
+ 41.182394
+ ],
+ [
+ -74.32178462800009,
+ 41.1827567464
+ ],
+ [
+ -74.3294460217567,
+ 41.1862763062489
+ ],
+ [
+ -74.33296412051749,
+ 41.187892482043495
+ ],
+ [
+ -74.3417562867814,
+ 41.191931506318895
+ ],
+ [
+ -74.3482867390981,
+ 41.1949315241354
+ ],
+ [
+ -74.3658486409186,
+ 41.202999268266495
+ ],
+ [
+ -74.3667409274852,
+ 41.2034091748805
+ ],
+ [
+ -74.378898,
+ 41.208994
+ ],
+ [
+ -74.38325505221279,
+ 41.2111663243698
+ ],
+ [
+ -74.42490502608901,
+ 41.2319320276097
+ ],
+ [
+ -74.4277238122384,
+ 41.2333374084834
+ ],
+ [
+ -74.4398054447606,
+ 41.2393610280025
+ ],
+ [
+ -74.457584,
+ 41.248225
+ ],
+ [
+ -74.4650683841403,
+ 41.2516304580161
+ ],
+ [
+ -74.4683595501201,
+ 41.2531279663425
+ ],
+ [
+ -74.4769605429558,
+ 41.2570414907487
+ ],
+ [
+ -74.499603,
+ 41.267344
+ ],
+ [
+ -74.5254868447246,
+ 41.279458922172296
+ ],
+ [
+ -74.53668906682219,
+ 41.2847021173126
+ ],
+ [
+ -74.536762565656,
+ 41.284736518409495
+ ],
+ [
+ -74.5561730480549,
+ 41.2938215861841
+ ],
+ [
+ -74.5561811083992,
+ 41.2938253588247
+ ],
+ [
+ -74.5611057739729,
+ 41.296130346386796
+ ],
+ [
+ -74.569298493675,
+ 41.29996494525059
+ ],
+ [
+ -74.57372828302171,
+ 41.3020383062117
+ ],
+ [
+ -74.607348,
+ 41.317774
+ ],
+ [
+ -74.6074601949831,
+ 41.3178235585805
+ ],
+ [
+ -74.641544,
+ 41.332879
+ ],
+ [
+ -74.64159926814601,
+ 41.3329044169266
+ ],
+ [
+ -74.6490283966458,
+ 41.3363209529937
+ ],
+ [
+ -74.6739266798342,
+ 41.3477712708235
+ ],
+ [
+ -74.68534256019629,
+ 41.353021249605696
+ ],
+ [
+ -74.69380232927801,
+ 41.3569117606108
+ ],
+ [
+ -74.694914,
+ 41.357423
+ ],
+ [
+ -74.696398,
+ 41.357339
+ ],
+ [
+ -74.6955762601585,
+ 41.3578023673928
+ ],
+ [
+ -74.691076,
+ 41.36034
+ ],
+ [
+ -74.689767,
+ 41.361558
+ ],
+ [
+ -74.689516,
+ 41.363843
+ ],
+ [
+ -74.691129,
+ 41.367324
+ ],
+ [
+ -74.694968,
+ 41.370431
+ ],
+ [
+ -74.697189701772,
+ 41.3716767990932
+ ],
+ [
+ -74.69720789676889,
+ 41.3716870017725
+ ],
+ [
+ -74.703282,
+ 41.375093
+ ],
+ [
+ -74.705977310032,
+ 41.3770759483388
+ ],
+ [
+ -74.708458,
+ 41.378901
+ ],
+ [
+ -74.710391,
+ 41.382102
+ ],
+ [
+ -74.7125522609777,
+ 41.38762108763579
+ ],
+ [
+ -74.713411,
+ 41.389814
+ ],
+ [
+ -74.715979,
+ 41.392584
+ ],
+ [
+ -74.720891,
+ 41.39469
+ ],
+ [
+ -74.730384,
+ 41.39566
+ ],
+ [
+ -74.73364,
+ 41.396975
+ ],
+ [
+ -74.736103,
+ 41.398398
+ ],
+ [
+ -74.738554,
+ 41.401191
+ ],
+ [
+ -74.740963,
+ 41.40512
+ ],
+ [
+ -74.741717,
+ 41.40788
+ ],
+ [
+ -74.741086,
+ 41.411413
+ ],
+ [
+ -74.738684,
+ 41.413463
+ ],
+ [
+ -74.734731,
+ 41.422699
+ ],
+ [
+ -74.734893,
+ 41.425818
+ ],
+ [
+ -74.735519,
+ 41.427465
+ ],
+ [
+ -74.736688,
+ 41.429228
+ ],
+ [
+ -74.7368903497227,
+ 41.4293898110686
+ ],
+ [
+ -74.738455,
+ 41.430641
+ ],
+ [
+ -74.740932,
+ 41.43116
+ ],
+ [
+ -74.743821,
+ 41.430635
+ ],
+ [
+ -74.75068,
+ 41.427984
+ ],
+ [
+ -74.754359,
+ 41.425147
+ ],
+ [
+ -74.7547086478625,
+ 41.4249931814039
+ ],
+ [
+ -74.758587,
+ 41.423287
+ ],
+ [
+ -74.763701,
+ 41.423612
+ ],
+ [
+ -74.77065,
+ 41.42623
+ ],
+ [
+ -74.773239,
+ 41.426352
+ ],
+ [
+ -74.778029,
+ 41.425104
+ ],
+ [
+ -74.784339,
+ 41.422397
+ ],
+ [
+ -74.790417,
+ 41.42166
+ ],
+ [
+ -74.793856,
+ 41.422671
+ ],
+ [
+ -74.795396,
+ 41.42398
+ ],
+ [
+ -74.799546,
+ 41.43129
+ ],
+ [
+ -74.800095,
+ 41.432661
+ ],
+ [
+ -74.80037,
+ 41.43606
+ ],
+ [
+ -74.801225,
+ 41.4381
+ ],
+ [
+ -74.805655,
+ 41.442101
+ ],
+ [
+ -74.807582,
+ 41.442847
+ ],
+ [
+ -74.812123,
+ 41.442982
+ ],
+ [
+ -74.8157699106046,
+ 41.4414436148557
+ ],
+ [
+ -74.817995,
+ 41.440505
+ ],
+ [
+ -74.8196438882251,
+ 41.4392517099325
+ ],
+ [
+ -74.82288,
+ 41.436792
+ ],
+ [
+ -74.826031,
+ 41.431736
+ ],
+ [
+ -74.828592,
+ 41.430698
+ ],
+ [
+ -74.830671,
+ 41.430503
+ ],
+ [
+ -74.834635,
+ 41.430796
+ ],
+ [
+ -74.836915,
+ 41.431625
+ ],
+ [
+ -74.845572,
+ 41.437577
+ ],
+ [
+ -74.848602,
+ 41.440179
+ ],
+ [
+ -74.8542,
+ 41.443166
+ ],
+ [
+ -74.858578,
+ 41.444427
+ ],
+ [
+ -74.864688,
+ 41.443993
+ ],
+ [
+ -74.876721,
+ 41.440338
+ ],
+ [
+ -74.888691,
+ 41.438259
+ ],
+ [
+ -74.893913,
+ 41.43893
+ ],
+ [
+ -74.896025,
+ 41.439987
+ ],
+ [
+ -74.896399,
+ 41.442179
+ ],
+ [
+ -74.894931,
+ 41.446099
+ ],
+ [
+ -74.889075,
+ 41.451245
+ ],
+ [
+ -74.889116,
+ 41.452534
+ ],
+ [
+ -74.890358,
+ 41.455324
+ ],
+ [
+ -74.892114,
+ 41.456959
+ ],
+ [
+ -74.895069,
+ 41.45819
+ ],
+ [
+ -74.90419401061838,
+ 41.4598049400021
+ ],
+ [
+ -74.9042,
+ 41.459806
+ ],
+ [
+ -74.906887,
+ 41.461131
+ ],
+ [
+ -74.908103,
+ 41.464639
+ ],
+ [
+ -74.908133,
+ 41.468117
+ ],
+ [
+ -74.909181,
+ 41.472436
+ ],
+ [
+ -74.912517,
+ 41.475605
+ ],
+ [
+ -74.9128529838652,
+ 41.47570625347959
+ ],
+ [
+ -74.917282,
+ 41.477041
+ ],
+ [
+ -74.92333354448,
+ 41.477127196742195
+ ],
+ [
+ -74.924092,
+ 41.477138
+ ],
+ [
+ -74.926835,
+ 41.478327
+ ],
+ [
+ -74.932585,
+ 41.482323
+ ],
+ [
+ -74.941798,
+ 41.483542
+ ],
+ [
+ -74.945634,
+ 41.483213
+ ],
+ [
+ -74.94808,
+ 41.480625
+ ],
+ [
+ -74.956411,
+ 41.476735
+ ],
+ [
+ -74.95826,
+ 41.476396
+ ],
+ [
+ -74.96594443131019,
+ 41.4770846709749
+ ],
+ [
+ -74.969887,
+ 41.477438
+ ],
+ [
+ -74.981652,
+ 41.479945
+ ],
+ [
+ -74.983341,
+ 41.480894
+ ],
+ [
+ -74.9844141877311,
+ 41.482706738627
+ ],
+ [
+ -74.985004,
+ 41.483703
+ ],
+ [
+ -74.985595,
+ 41.485863
+ ],
+ [
+ -74.9854694904053,
+ 41.487035144203396
+ ],
+ [
+ -74.985247,
+ 41.489113
+ ],
+ [
+ -74.982463,
+ 41.496467
+ ],
+ [
+ -74.982168,
+ 41.498486
+ ],
+ [
+ -74.982385,
+ 41.500981
+ ],
+ [
+ -74.98392291673889,
+ 41.50533855975839
+ ],
+ [
+ -74.984372,
+ 41.506611
+ ],
+ [
+ -74.985653,
+ 41.507926
+ ],
+ [
+ -74.987645,
+ 41.508738
+ ],
+ [
+ -74.993893,
+ 41.508754
+ ],
+ [
+ -74.999612,
+ 41.5074
+ ],
+ [
+ -75.0013296363481,
+ 41.5077402269229
+ ],
+ [
+ -75.00151469210721,
+ 41.5077768824999
+ ],
+ [
+ -75.003151,
+ 41.508101
+ ],
+ [
+ -75.003694,
+ 41.509295
+ ],
+ [
+ -75.003706,
+ 41.511118
+ ],
+ [
+ -75.0036840704305,
+ 41.511185757251496
+ ],
+ [
+ -75.002592,
+ 41.51456
+ ],
+ [
+ -75.000935,
+ 41.517638
+ ],
+ [
+ -75.000911,
+ 41.519292
+ ],
+ [
+ -75.001297,
+ 41.52065
+ ],
+ [
+ -75.00385,
+ 41.524052
+ ],
+ [
+ -75.009552,
+ 41.528461
+ ],
+ [
+ -75.014919,
+ 41.531399
+ ],
+ [
+ -75.016616,
+ 41.53211
+ ],
+ [
+ -75.023018,
+ 41.533147
+ ],
+ [
+ -75.024206,
+ 41.534018
+ ],
+ [
+ -75.024757,
+ 41.535099
+ ],
+ [
+ -75.02479298627729,
+ 41.5392260116041
+ ],
+ [
+ -75.024798,
+ 41.539801
+ ],
+ [
+ -75.022828,
+ 41.541456
+ ],
+ [
+ -75.017626,
+ 41.542734
+ ],
+ [
+ -75.016144,
+ 41.544246
+ ],
+ [
+ -75.016328,
+ 41.546501
+ ],
+ [
+ -75.018524,
+ 41.551802
+ ],
+ [
+ -75.027343,
+ 41.563541
+ ],
+ [
+ -75.029211,
+ 41.564637
+ ],
+ [
+ -75.033162,
+ 41.565092
+ ],
+ [
+ -75.036989,
+ 41.567049
+ ],
+ [
+ -75.04049,
+ 41.569688
+ ],
+ [
+ -75.043879,
+ 41.575094
+ ],
+ [
+ -75.04676,
+ 41.583258
+ ],
+ [
+ -75.052858,
+ 41.587772
+ ],
+ [
+ -75.060012,
+ 41.590813
+ ],
+ [
+ -75.0610707883855,
+ 41.591947189140896
+ ],
+ [
+ -75.063677,
+ 41.594739
+ ],
+ [
+ -75.066955,
+ 41.599428
+ ],
+ [
+ -75.0697121394208,
+ 41.6016900928416
+ ],
+ [
+ -75.074613,
+ 41.605711
+ ],
+ [
+ -75.074626,
+ 41.607905
+ ],
+ [
+ -75.071667,
+ 41.609501
+ ],
+ [
+ -75.0708835581811,
+ 41.609630899185895
+ ],
+ [
+ -75.067795,
+ 41.610143
+ ],
+ [
+ -75.062716,
+ 41.609639
+ ],
+ [
+ -75.059725,
+ 41.610801
+ ],
+ [
+ -75.059956,
+ 41.612306
+ ],
+ [
+ -75.0607697024613,
+ 41.6138027581051
+ ],
+ [
+ -75.061675,
+ 41.615468
+ ],
+ [
+ -75.06156,
+ 41.616429
+ ],
+ [
+ -75.060098,
+ 41.617482
+ ],
+ [
+ -75.05385,
+ 41.618655
+ ],
+ [
+ -75.051856,
+ 41.618157
+ ],
+ [
+ -75.048385,
+ 41.615986
+ ],
+ [
+ -75.047298,
+ 41.615791
+ ],
+ [
+ -75.045508,
+ 41.616203
+ ],
+ [
+ -75.044224,
+ 41.617978
+ ],
+ [
+ -75.043562,
+ 41.62364
+ ],
+ [
+ -75.048199,
+ 41.632011
+ ],
+ [
+ -75.048658,
+ 41.633781
+ ],
+ [
+ -75.049281,
+ 41.641862
+ ],
+ [
+ -75.0489469091359,
+ 41.6499377248171
+ ],
+ [
+ -75.048683,
+ 41.656317
+ ],
+ [
+ -75.04992,
+ 41.662556
+ ],
+ [
+ -75.053991,
+ 41.668194
+ ],
+ [
+ -75.057251,
+ 41.668933
+ ],
+ [
+ -75.05843,
+ 41.669653
+ ],
+ [
+ -75.0584418628496,
+ 41.6696880756317
+ ],
+ [
+ -75.0584420511039,
+ 41.6696886322549
+ ],
+ [
+ -75.059332,
+ 41.67232
+ ],
+ [
+ -75.058765,
+ 41.674412
+ ],
+ [
+ -75.052653,
+ 41.678436
+ ],
+ [
+ -75.051285,
+ 41.679961
+ ],
+ [
+ -75.051234,
+ 41.682439
+ ],
+ [
+ -75.052736,
+ 41.688393
+ ],
+ [
+ -75.056745,
+ 41.695703
+ ],
+ [
+ -75.059829,
+ 41.699716
+ ],
+ [
+ -75.0667122223762,
+ 41.7049996978852
+ ],
+ [
+ -75.067278,
+ 41.705434
+ ],
+ [
+ -75.06883,
+ 41.708161
+ ],
+ [
+ -75.068642,
+ 41.710146
+ ],
+ [
+ -75.06663,
+ 41.712588
+ ],
+ [
+ -75.061174,
+ 41.712935
+ ],
+ [
+ -75.052226,
+ 41.711396
+ ],
+ [
+ -75.050689,
+ 41.711969
+ ],
+ [
+ -75.049862,
+ 41.713309
+ ],
+ [
+ -75.049699,
+ 41.715093
+ ],
+ [
+ -75.053527,
+ 41.72715
+ ],
+ [
+ -75.0540005515252,
+ 41.7300910814322
+ ],
+ [
+ -75.054818,
+ 41.735168
+ ],
+ [
+ -75.052808,
+ 41.744725
+ ],
+ [
+ -75.053431,
+ 41.752538
+ ],
+ [
+ -75.0559907769634,
+ 41.7567647059576
+ ],
+ [
+ -75.060759,
+ 41.764638
+ ],
+ [
+ -75.064901,
+ 41.766686
+ ],
+ [
+ -75.068567,
+ 41.767298
+ ],
+ [
+ -75.072664,
+ 41.768807
+ ],
+ [
+ -75.0734529997726,
+ 41.76966850517609
+ ],
+ [
+ -75.074231,
+ 41.770518
+ ],
+ [
+ -75.075942,
+ 41.771518
+ ],
+ [
+ -75.079478,
+ 41.771205
+ ],
+ [
+ -75.09281,
+ 41.768361
+ ],
+ [
+ -75.095451,
+ 41.768366
+ ],
+ [
+ -75.10099,
+ 41.769121
+ ],
+ [
+ -75.103492,
+ 41.771238
+ ],
+ [
+ -75.104334,
+ 41.772693
+ ],
+ [
+ -75.10464,
+ 41.774203
+ ],
+ [
+ -75.1039936438857,
+ 41.7788227888939
+ ],
+ [
+ -75.103548,
+ 41.782008
+ ],
+ [
+ -75.102329,
+ 41.786503
+ ],
+ [
+ -75.101463,
+ 41.787941
+ ],
+ [
+ -75.092876,
+ 41.796386
+ ],
+ [
+ -75.088328,
+ 41.797534
+ ],
+ [
+ -75.081415,
+ 41.796483
+ ],
+ [
+ -75.07827,
+ 41.797467
+ ],
+ [
+ -75.076889,
+ 41.798509
+ ],
+ [
+ -75.074412,
+ 41.802191
+ ],
+ [
+ -75.07390218134219,
+ 41.803585049591895
+ ],
+ [
+ -75.072168,
+ 41.808327
+ ],
+ [
+ -75.071751,
+ 41.811901
+ ],
+ [
+ -75.072172,
+ 41.813732
+ ],
+ [
+ -75.074409,
+ 41.815088
+ ],
+ [
+ -75.078063,
+ 41.815112
+ ],
+ [
+ -75.079818,
+ 41.814815
+ ],
+ [
+ -75.085789,
+ 41.811626
+ ],
+ [
+ -75.089484,
+ 41.811576
+ ],
+ [
+ -75.093537,
+ 41.813375
+ ],
+ [
+ -75.100024,
+ 41.818347
+ ],
+ [
+ -75.113334,
+ 41.822782
+ ],
+ [
+ -75.114837,
+ 41.82567
+ ],
+ [
+ -75.115147,
+ 41.827285
+ ],
+ [
+ -75.114998,
+ 41.8303
+ ],
+ [
+ -75.113441,
+ 41.836298
+ ],
+ [
+ -75.113369,
+ 41.840698
+ ],
+ [
+ -75.114399,
+ 41.843583
+ ],
+ [
+ -75.115598,
+ 41.844638
+ ],
+ [
+ -75.118789,
+ 41.845819
+ ],
+ [
+ -75.127913,
+ 41.844903
+ ],
+ [
+ -75.130983,
+ 41.845145
+ ],
+ [
+ -75.140241,
+ 41.852078
+ ],
+ [
+ -75.143824,
+ 41.851737
+ ],
+ [
+ -75.146446,
+ 41.850899
+ ],
+ [
+ -75.152898,
+ 41.848564
+ ],
+ [
+ -75.156512,
+ 41.848327
+ ],
+ [
+ -75.161541,
+ 41.849836
+ ],
+ [
+ -75.164168,
+ 41.851586
+ ],
+ [
+ -75.166217,
+ 41.853862
+ ],
+ [
+ -75.168733,
+ 41.859258
+ ],
+ [
+ -75.168053,
+ 41.867043
+ ],
+ [
+ -75.169142,
+ 41.87029
+ ],
+ [
+ -75.1693083664794,
+ 41.8704440906675
+ ],
+ [
+ -75.170565,
+ 41.871608
+ ],
+ [
+ -75.174574,
+ 41.87266
+ ],
+ [
+ -75.176633,
+ 41.872371
+ ],
+ [
+ -75.179134,
+ 41.869935
+ ],
+ [
+ -75.180497,
+ 41.86568
+ ],
+ [
+ -75.182271,
+ 41.862198
+ ],
+ [
+ -75.183937,
+ 41.860515
+ ],
+ [
+ -75.185254,
+ 41.85993
+ ],
+ [
+ -75.186993,
+ 41.860109
+ ],
+ [
+ -75.188888,
+ 41.861264
+ ],
+ [
+ -75.190203,
+ 41.862454
+ ],
+ [
+ -75.191441,
+ 41.865063
+ ],
+ [
+ -75.194382,
+ 41.867287
+ ],
+ [
+ -75.197836,
+ 41.868807
+ ],
+ [
+ -75.204002,
+ 41.869867
+ ],
+ [
+ -75.209741,
+ 41.86925
+ ],
+ [
+ -75.21380942028689,
+ 41.867848733039395
+ ],
+ [
+ -75.21497,
+ 41.867449
+ ],
+ [
+ -75.220125,
+ 41.860534
+ ],
+ [
+ -75.223734,
+ 41.857456
+ ],
+ [
+ -75.2250923136995,
+ 41.8574730986115
+ ],
+ [
+ -75.22572,
+ 41.857481
+ ],
+ [
+ -75.231612,
+ 41.859459
+ ],
+ [
+ -75.234565,
+ 41.861569
+ ],
+ [
+ -75.238743,
+ 41.865699
+ ],
+ [
+ -75.241134,
+ 41.867118
+ ],
+ [
+ -75.243345,
+ 41.866875
+ ],
+ [
+ -75.248045,
+ 41.8633
+ ],
+ [
+ -75.251197,
+ 41.86204
+ ],
+ [
+ -75.257825,
+ 41.862154
+ ],
+ [
+ -75.260527,
+ 41.8638
+ ],
+ [
+ -75.262802,
+ 41.866213
+ ],
+ [
+ -75.263673,
+ 41.868105
+ ],
+ [
+ -75.263815,
+ 41.870757
+ ],
+ [
+ -75.261488,
+ 41.873277
+ ],
+ [
+ -75.258439,
+ 41.875087
+ ],
+ [
+ -75.257564,
+ 41.877108
+ ],
+ [
+ -75.260623,
+ 41.883783
+ ],
+ [
+ -75.263005,
+ 41.885109
+ ],
+ [
+ -75.267789,
+ 41.885982
+ ],
+ [
+ -75.271292,
+ 41.88736
+ ],
+ [
+ -75.272581,
+ 41.893168
+ ],
+ [
+ -75.272778,
+ 41.897112
+ ],
+ [
+ -75.267773,
+ 41.901971
+ ],
+ [
+ -75.267562,
+ 41.907054
+ ],
+ [
+ -75.269736,
+ 41.911363
+ ],
+ [
+ -75.275368,
+ 41.919564
+ ],
+ [
+ -75.276552,
+ 41.922208
+ ],
+ [
+ -75.276501,
+ 41.926679
+ ],
+ [
+ -75.27712816121169,
+ 41.932527151515
+ ],
+ [
+ -75.277243,
+ 41.933598
+ ],
+ [
+ -75.279094,
+ 41.938917
+ ],
+ [
+ -75.289383,
+ 41.942891
+ ],
+ [
+ -75.290966,
+ 41.945039
+ ],
+ [
+ -75.291762,
+ 41.947092
+ ],
+ [
+ -75.29143,
+ 41.952477
+ ],
+ [
+ -75.293713,
+ 41.954593
+ ],
+ [
+ -75.296692075794,
+ 41.9545489290205
+ ],
+ [
+ -75.29858,
+ 41.954521
+ ],
+ [
+ -75.300409,
+ 41.953871
+ ],
+ [
+ -75.301593,
+ 41.952811
+ ],
+ [
+ -75.30154394193059,
+ 41.9522780385848
+ ],
+ [
+ -75.301233,
+ 41.9489
+ ],
+ [
+ -75.301664,
+ 41.94838
+ ],
+ [
+ -75.303966,
+ 41.948216
+ ],
+ [
+ -75.310358,
+ 41.949012
+ ],
+ [
+ -75.312817,
+ 41.950182
+ ],
+ [
+ -75.318168,
+ 41.954236
+ ],
+ [
+ -75.32004,
+ 41.960867
+ ],
+ [
+ -75.322384,
+ 41.961693
+ ],
+ [
+ -75.329318,
+ 41.968232
+ ],
+ [
+ -75.33483949716181,
+ 41.9700143149834
+ ],
+ [
+ -75.335771,
+ 41.970315
+ ],
+ [
+ -75.339488,
+ 41.970786
+ ],
+ [
+ -75.342204,
+ 41.972872
+ ],
+ [
+ -75.34246,
+ 41.974303
+ ],
+ [
+ -75.337791,
+ 41.984386
+ ],
+ [
+ -75.337602,
+ 41.9867
+ ],
+ [
+ -75.341125,
+ 41.992772
+ ],
+ [
+ -75.342125474072,
+ 41.9932410813581
+ ],
+ [
+ -75.346568,
+ 41.995324
+ ],
+ [
+ -75.353504,
+ 41.99711
+ ],
+ [
+ -75.359579,
+ 41.999445
+ ],
+ [
+ -75.431961,
+ 41.999363
+ ],
+ [
+ -75.436216,
+ 41.999353
+ ],
+ [
+ -75.477144,
+ 41.999407
+ ],
+ [
+ -75.4831501008195,
+ 41.9992585325396
+ ],
+ [
+ -75.483738,
+ 41.999244
+ ],
+ [
+ -75.53882296950209,
+ 41.999120407184996
+ ],
+ [
+ -75.55307597628,
+ 41.9990884280581
+ ],
+ [
+ -75.6075741102809,
+ 41.998966151911695
+ ],
+ [
+ -75.60970946455079,
+ 41.998961360868904
+ ],
+ [
+ -75.610316,
+ 41.99896
+ ],
+ [
+ -75.65558859675559,
+ 41.9985838181208
+ ],
+ [
+ -75.742217,
+ 41.997864
+ ],
+ [
+ -75.7625404568361,
+ 41.9980165129409
+ ],
+ [
+ -75.7733433652803,
+ 41.9980975810068
+ ],
+ [
+ -75.870677,
+ 41.998828
+ ],
+ [
+ -75.89061850943921,
+ 41.998865672533
+ ],
+ [
+ -75.9584074252567,
+ 41.9989937360666
+ ],
+ [
+ -75.98025,
+ 41.999035
+ ],
+ [
+ -75.983082,
+ 41.999035
+ ],
+ [
+ -75.98884201109489,
+ 41.9990266948634
+ ],
+ [
+ -75.9935630222134,
+ 41.999019887820495
+ ],
+ [
+ -76.0600871153046,
+ 41.9989239693103
+ ],
+ [
+ -76.10584,
+ 41.998858
+ ],
+ [
+ -76.1109074353043,
+ 41.998885244275804
+ ],
+ [
+ -76.123696,
+ 41.998954
+ ],
+ [
+ -76.131201,
+ 41.998954
+ ],
+ [
+ -76.1455192032297,
+ 41.9989130371419
+ ],
+ [
+ -76.2049277590365,
+ 41.998743075576094
+ ],
+ [
+ -76.264295558534,
+ 41.9985732306097
+ ],
+ [
+ -76.2757870621589,
+ 41.9985403546389
+ ],
+ [
+ -76.2950082941062,
+ 41.998485364736595
+ ],
+ [
+ -76.343722,
+ 41.998346
+ ],
+ [
+ -76.349898,
+ 41.99841
+ ],
+ [
+ -76.3500208110541,
+ 41.9984105732648
+ ],
+ [
+ -76.38153964198091,
+ 41.9985576987662
+ ],
+ [
+ -76.462155,
+ 41.998934
+ ],
+ [
+ -76.46654,
+ 41.999025
+ ],
+ [
+ -76.47303045547619,
+ 41.9991050870808
+ ],
+ [
+ -76.473424761107,
+ 41.9991099525001
+ ],
+ [
+ -76.5119494773177,
+ 41.9995853169906
+ ],
+ [
+ -76.5233737373808,
+ 41.999726283313
+ ],
+ [
+ -76.5243210070324,
+ 41.999737971870395
+ ],
+ [
+ -76.53213854089951,
+ 41.9998344340476
+ ],
+ [
+ -76.535051525922,
+ 41.9998703779761
+ ],
+ [
+ -76.5487494269461,
+ 42.000039399227404
+ ],
+ [
+ -76.55762413688969,
+ 42.000148906120295
+ ],
+ [
+ -76.5576989990395,
+ 42.00014982986
+ ],
+ [
+ -76.558118,
+ 42.000155
+ ],
+ [
+ -76.6381035393041,
+ 42.000795529019
+ ],
+ [
+ -76.70165390486379,
+ 42.0013044441762
+ ],
+ [
+ -76.70570765942209,
+ 42.001336906887
+ ],
+ [
+ -76.7283643213311,
+ 42.0015183428009
+ ],
+ [
+ -76.7295735474483,
+ 42.0015280263566
+ ],
+ [
+ -76.7307568339931,
+ 42.0015375021865
+ ],
+ [
+ -76.7472729858696,
+ 42.0016697645261
+ ],
+ [
+ -76.749675,
+ 42.001689
+ ],
+ [
+ -76.7877673119525,
+ 42.001679793816095
+ ],
+ [
+ -76.815878,
+ 42.001673
+ ],
+ [
+ -76.8305574042013,
+ 42.00174945124839
+ ],
+ [
+ -76.835079,
+ 42.001773
+ ],
+ [
+ -76.901387354567,
+ 42.0017737736813
+ ],
+ [
+ -76.920784,
+ 42.001774
+ ],
+ [
+ -76.921884,
+ 42.001674
+ ],
+ [
+ -76.927084,
+ 42.001674
+ ],
+ [
+ -76.937084,
+ 42.001674
+ ],
+ [
+ -76.942585,
+ 42.001574
+ ],
+ [
+ -76.965686,
+ 42.001274
+ ],
+ [
+ -76.96572797329421,
+ 42.0012735436595
+ ],
+ [
+ -77.007536,
+ 42.000819
+ ],
+ [
+ -77.007635,
+ 42.000848
+ ],
+ [
+ -77.052862018491,
+ 42.0005356776618
+ ],
+ [
+ -77.063676,
+ 42.000461
+ ],
+ [
+ -77.08327077535189,
+ 42.0001186686739
+ ],
+ [
+ -77.1145964917953,
+ 41.9995713914605
+ ],
+ [
+ -77.11477599521339,
+ 41.999568255438696
+ ],
+ [
+ -77.124693,
+ 41.999395
+ ],
+ [
+ -77.14451518735049,
+ 41.9994301535711
+ ],
+ [
+ -77.2005104585099,
+ 41.999529458138795
+ ],
+ [
+ -77.2198524292409,
+ 41.999563760071794
+ ],
+ [
+ -77.2911745625338,
+ 41.9996902459959
+ ],
+ [
+ -77.3162554733007,
+ 41.999734725626894
+ ],
+ [
+ -77.31626805542379,
+ 41.99973474794059
+ ],
+ [
+ -77.330048172126,
+ 41.999759186228005
+ ],
+ [
+ -77.4282252442071,
+ 41.999933297925296
+ ],
+ [
+ -77.4396951853604,
+ 41.9999536392421
+ ],
+ [
+ -77.4565781532607,
+ 41.9999835802673
+ ],
+ [
+ -77.4763238849402,
+ 42.000018598248396
+ ],
+ [
+ -77.5039770006392,
+ 42.000067639545
+ ],
+ [
+ -77.505308,
+ 42.00007
+ ],
+ [
+ -77.6100277930756,
+ 41.99951862464489
+ ],
+ [
+ -77.6357179808319,
+ 41.99938335951519
+ ],
+ [
+ -77.7286967097747,
+ 41.998893803738
+ ],
+ [
+ -77.749931,
+ 41.998782
+ ],
+ [
+ -77.822799,
+ 41.998547
+ ],
+ [
+ -77.83203,
+ 41.998524
+ ],
+ [
+ -77.8402108247012,
+ 41.998535568383595
+ ],
+ [
+ -77.8454909264182,
+ 41.9985430348976
+ ],
+ [
+ -77.8632385981808,
+ 41.9985681316185
+ ],
+ [
+ -77.88091542468621,
+ 41.9985931281583
+ ],
+ [
+ -77.9571540665524,
+ 41.9987009360977
+ ],
+ [
+ -77.9627561781712,
+ 41.9987088579611
+ ],
+ [
+ -77.997508,
+ 41.998758
+ ],
+ [
+ -78.030963,
+ 41.999392
+ ],
+ [
+ -78.031177,
+ 41.999415
+ ],
+ [
+ -78.05523172451589,
+ 41.9996816376206
+ ],
+ [
+ -78.0725742930209,
+ 41.999873873503404
+ ],
+ [
+ -78.07435121806809,
+ 41.9998935700527
+ ],
+ [
+ -78.0889777151329,
+ 42.00005569929979
+ ],
+ [
+ -78.12146456053131,
+ 42.0004158038253
+ ],
+ [
+ -78.12473,
+ 42.000452
+ ],
+ [
+ -78.191259,
+ 41.999777962041
+ ],
+ [
+ -78.2066042785298,
+ 41.999622491491095
+ ],
+ [
+ -78.2657029214294,
+ 41.9990237341275
+ ],
+ [
+ -78.2688108707826,
+ 41.9989922459669
+ ],
+ [
+ -78.271204,
+ 41.998968
+ ],
+ [
+ -78.28402317930949,
+ 41.999123188309795
+ ],
+ [
+ -78.30707296533919,
+ 41.999402227805895
+ ],
+ [
+ -78.308128,
+ 41.999415
+ ],
+ [
+ -78.3228225920882,
+ 41.9994385299268
+ ],
+ [
+ -78.3469833930884,
+ 41.9994772177567
+ ],
+ [
+ -78.34876917761659,
+ 41.9994800772699
+ ],
+ [
+ -78.3502171245398,
+ 41.9994823958157
+ ],
+ [
+ -78.38590210642501,
+ 41.9995395369059
+ ],
+ [
+ -78.44416516840259,
+ 41.999632831471395
+ ],
+ [
+ -78.4629358211364,
+ 41.9996628882489
+ ],
+ [
+ -78.4633181849452,
+ 41.9996635005145
+ ],
+ [
+ -78.5197862291076,
+ 41.9997539207819
+ ],
+ [
+ -78.5331131426055,
+ 41.9997752606938
+ ],
+ [
+ -78.5796821059558,
+ 41.999849829915696
+ ],
+ [
+ -78.59665,
+ 41.999877
+ ],
+ [
+ -78.6180012360605,
+ 41.9996304422004
+ ],
+ [
+ -78.6972505992235,
+ 41.9987152938432
+ ],
+ [
+ -78.7146649838316,
+ 41.9985141976473
+ ],
+ [
+ -78.749754,
+ 41.998109
+ ],
+ [
+ -78.780545282318,
+ 41.99797352377679
+ ],
+ [
+ -78.8274137813755,
+ 41.9977673106295
+ ],
+ [
+ -78.874759,
+ 41.997559
+ ],
+ [
+ -78.9056799837033,
+ 41.9979558401321
+ ],
+ [
+ -78.9188549239275,
+ 41.998124927411794
+ ],
+ [
+ -78.9445211211111,
+ 41.9984543275751
+ ],
+ [
+ -78.9613715561207,
+ 41.998670586181795
+ ],
+ [
+ -78.9775660458638,
+ 41.9988784263822
+ ],
+ [
+ -78.983065,
+ 41.998949
+ ],
+ [
+ -79.04206011548449,
+ 41.999182868104896
+ ],
+ [
+ -79.0524722756512,
+ 41.9992241439316
+ ],
+ [
+ -79.061265,
+ 41.999259
+ ],
+ [
+ -79.1301304127579,
+ 41.9993758255159
+ ],
+ [
+ -79.1449956209558,
+ 41.9994010433363
+ ],
+ [
+ -79.17857,
+ 41.999458
+ ],
+ [
+ -79.1795189762635,
+ 41.9994493235085
+ ],
+ [
+ -79.23439699250319,
+ 41.9989475737181
+ ],
+ [
+ -79.249772,
+ 41.998807
+ ],
+ [
+ -79.2858650047183,
+ 41.998717537321
+ ],
+ [
+ -79.38039448500619,
+ 41.9984832298531
+ ],
+ [
+ -79.3817154843262,
+ 41.9984799555306
+ ],
+ [
+ -79.39405445189679,
+ 41.9984493712912
+ ],
+ [
+ -79.411174489236,
+ 41.9984069363536
+ ],
+ [
+ -79.472472,
+ 41.998255
+ ],
+ [
+ -79.49162964093681,
+ 41.99833398501409
+ ],
+ [
+ -79.5109917186785,
+ 41.9984138129004
+ ],
+ [
+ -79.5279932931023,
+ 41.9984839086706
+ ],
+ [
+ -79.538445,
+ 41.998527
+ ],
+ [
+ -79.551385,
+ 41.998666
+ ],
+ [
+ -79.6108388547624,
+ 41.9989893460903
+ ],
+ [
+ -79.625301,
+ 41.999068
+ ],
+ [
+ -79.625287,
+ 41.999003
+ ],
+ [
+ -79.6309099535456,
+ 41.9990446320015
+ ],
+ [
+ -79.645283808738,
+ 41.9991510551393
+ ],
+ [
+ -79.670128,
+ 41.999335
+ ],
+ [
+ -79.7611537596756,
+ 41.9990676468712
+ ],
+ [
+ -79.7613137612325,
+ 41.99906717692819
+ ],
+ [
+ -79.761374,
+ 41.999067
+ ],
+ [
+ -79.761798,
+ 42.019042
+ ],
+ [
+ -79.7617776897587,
+ 42.0418506291231
+ ],
+ [
+ -79.7617380985535,
+ 42.086311997416395
+ ],
+ [
+ -79.7617091513834,
+ 42.118819994688295
+ ],
+ [
+ -79.761709,
+ 42.11899
+ ],
+ [
+ -79.762122,
+ 42.131246
+ ],
+ [
+ -79.761861,
+ 42.150712
+ ],
+ [
+ -79.7618218688657,
+ 42.1553014682316
+ ],
+ [
+ -79.761759,
+ 42.162675
+ ],
+ [
+ -79.76175930015769,
+ 42.162694721474494
+ ],
+ [
+ -79.7619209542138,
+ 42.1733159916777
+ ],
+ [
+ -79.761921,
+ 42.173319
+ ],
+ [
+ -79.761929,
+ 42.179693
+ ],
+ [
+ -79.761833,
+ 42.183627
+ ],
+ [
+ -79.7620878290939,
+ 42.2310995033323
+ ],
+ [
+ -79.7621408455027,
+ 42.240976011565195
+ ],
+ [
+ -79.762152,
+ 42.243054
+ ]
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/test_geometry_loader_ndjson.ndjson b/tests/data/test_geometry_loader_ndjson.ndjson
new file mode 100644
index 00000000..4e0a1944
--- /dev/null
+++ b/tests/data/test_geometry_loader_ndjson.ndjson
@@ -0,0 +1,6 @@
+{"parent_id": null, "name": "United States", "aliases": [{"name": "The Good Old U. S. of A.", "language": "eng"}], "type": "nation", "abbreviated_name": "US", "id": "US"}
+{"type": "Point", "coordinates": [-159.459551, 54.948652]}
+{"parent_id": "US", "name": "Alabama", "aliases": [], "type": "state", "abbreviated_name": "AL", "id": "01"}
+{"type": "Point", "coordinates": [-88.053375, 30.506987]}
+{"parent_id": "01", "name": "Montgomery", "aliases": [], "type": "city", "abbreviated_name": null, "id": "0151000"}
+{"type": "Point", "coordinates": [-86.034128, 32.302979]}
\ No newline at end of file
diff --git a/tests/data/test_load_places_script_ndjson.ndjson b/tests/data/test_load_places_script_ndjson.ndjson
new file mode 100644
index 00000000..85002f89
--- /dev/null
+++ b/tests/data/test_load_places_script_ndjson.ndjson
@@ -0,0 +1,6 @@
+{"parent_id": null, "name": "United States", "full_name": null, "aliases": [], "type": "nation", "abbreviated_name": "US", "id": "US"}
+{"type": "Point", "coordinates": [-159.459551, 54.948652]}
+{"parent_id": "US", "name": "Alabama", "full_name": null, "aliases": [], "type": "state", "abbreviated_name": "AL", "id": "01"}
+{"type": "Point", "coordinates": [-88.053375, 30.506987]}
+{"parent_id": "01", "name": "Montgomery", "full_name": null, "aliases": [], "type": "city", "abbreviated_name": null, "id": "0151000"}
+{"type": "Point", "coordinates": [-86.034128, 32.302979]}
\ No newline at end of file
diff --git a/tests/data/zip_10018_geojson.json b/tests/data/zip_10018_geojson.json
new file mode 100644
index 00000000..caf64a79
--- /dev/null
+++ b/tests/data/zip_10018_geojson.json
@@ -0,0 +1,108 @@
+{
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ -74.007203,
+ 40.75927
+ ],
+ [
+ -74.004743,
+ 40.759033
+ ],
+ [
+ -74.001716,
+ 40.762208
+ ],
+ [
+ -74.001036,
+ 40.761968
+ ],
+ [
+ -74.001622,
+ 40.761347
+ ],
+ [
+ -73.996942,
+ 40.759377
+ ],
+ [
+ -73.998615,
+ 40.758737
+ ],
+ [
+ -73.996801,
+ 40.757789
+ ],
+ [
+ -73.994378,
+ 40.758377
+ ],
+ [
+ -73.984596,
+ 40.754177
+ ],
+ [
+ -73.985043,
+ 40.753554
+ ],
+ [
+ -73.981822,
+ 40.752197
+ ],
+ [
+ -73.984076,
+ 40.749102
+ ],
+ [
+ -73.990134,
+ 40.751659
+ ],
+ [
+ -73.989694,
+ 40.75228
+ ],
+ [
+ -73.992528,
+ 40.753474
+ ],
+ [
+ -73.992979,
+ 40.752854
+ ],
+ [
+ -73.998661,
+ 40.755252
+ ],
+ [
+ -74.0015,
+ 40.756452
+ ],
+ [
+ -74.000067,
+ 40.758403
+ ],
+ [
+ -74.002843,
+ 40.759686
+ ],
+ [
+ -74.005593,
+ 40.755893
+ ],
+ [
+ -74.006145,
+ 40.756189
+ ],
+ [
+ -74.004957,
+ 40.757872
+ ],
+ [
+ -74.007203,
+ 40.75927
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/zip_11212_geojson.json b/tests/data/zip_11212_geojson.json
new file mode 100644
index 00000000..6f890ff7
--- /dev/null
+++ b/tests/data/zip_11212_geojson.json
@@ -0,0 +1,108 @@
+{
+ "type": "Polygon",
+ "coordinates": [
+ [
+ [
+ -73.931607,
+ 40.663557
+ ],
+ [
+ -73.930685,
+ 40.66362
+ ],
+ [
+ -73.928544,
+ 40.664574
+ ],
+ [
+ -73.92638,
+ 40.665515
+ ],
+ [
+ -73.924389,
+ 40.666385
+ ],
+ [
+ -73.922753,
+ 40.667098
+ ],
+ [
+ -73.918382,
+ 40.669002
+ ],
+ [
+ -73.920044,
+ 40.669137
+ ],
+ [
+ -73.914873,
+ 40.670533
+ ],
+ [
+ -73.903475,
+ 40.675507
+ ],
+ [
+ -73.900417,
+ 40.663806
+ ],
+ [
+ -73.900661,
+ 40.660587
+ ],
+ [
+ -73.898807,
+ 40.657407
+ ],
+ [
+ -73.899041,
+ 40.657372
+ ],
+ [
+ -73.903173,
+ 40.655301
+ ],
+ [
+ -73.907856,
+ 40.654589
+ ],
+ [
+ -73.909726,
+ 40.654313
+ ],
+ [
+ -73.917576,
+ 40.654314
+ ],
+ [
+ -73.921005,
+ 40.654918
+ ],
+ [
+ -73.921776,
+ 40.654424
+ ],
+ [
+ -73.927201,
+ 40.658537
+ ],
+ [
+ -73.927255,
+ 40.659338
+ ],
+ [
+ -73.928193,
+ 40.660177
+ ],
+ [
+ -73.931556,
+ 40.662756
+ ],
+ [
+ -73.931607,
+ 40.663557
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/data/zip_12601_geojson.json b/tests/data/zip_12601_geojson.json
new file mode 100644
index 00000000..c804f447
--- /dev/null
+++ b/tests/data/zip_12601_geojson.json
@@ -0,0 +1,1012 @@
+{
+ "type": "MultiPolygon",
+ "coordinates": [
+ [
+ [
+ [
+ -73.915403,
+ 41.616163
+ ],
+ [
+ -73.912859,
+ 41.617506
+ ],
+ [
+ -73.912785,
+ 41.617868
+ ],
+ [
+ -73.910085,
+ 41.617764
+ ],
+ [
+ -73.906318,
+ 41.612723
+ ],
+ [
+ -73.908604,
+ 41.612868
+ ],
+ [
+ -73.909996,
+ 41.614368
+ ],
+ [
+ -73.913246,
+ 41.612898
+ ],
+ [
+ -73.915403,
+ 41.616163
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.919091,
+ 41.677363
+ ],
+ [
+ -73.917514,
+ 41.677653
+ ],
+ [
+ -73.917334,
+ 41.677546
+ ],
+ [
+ -73.917086,
+ 41.675994
+ ],
+ [
+ -73.91902,
+ 41.676467
+ ],
+ [
+ -73.919091,
+ 41.677363
+ ]
+ ]
+ ],
+ [
+ [
+ [
+ -73.947611,
+ 41.631138
+ ],
+ [
+ -73.944689,
+ 41.63835
+ ],
+ [
+ -73.944262,
+ 41.639905
+ ],
+ [
+ -73.944761,
+ 41.644452
+ ],
+ [
+ -73.94416,
+ 41.646044
+ ],
+ [
+ -73.943759,
+ 41.650743
+ ],
+ [
+ -73.941998,
+ 41.656157
+ ],
+ [
+ -73.941808,
+ 41.658506
+ ],
+ [
+ -73.943147,
+ 41.664657
+ ],
+ [
+ -73.942695,
+ 41.667728
+ ],
+ [
+ -73.94314,
+ 41.670341
+ ],
+ [
+ -73.941727,
+ 41.671089
+ ],
+ [
+ -73.941275,
+ 41.672252
+ ],
+ [
+ -73.939717,
+ 41.680067
+ ],
+ [
+ -73.937987,
+ 41.683989
+ ],
+ [
+ -73.938866,
+ 41.687861
+ ],
+ [
+ -73.938636,
+ 41.69004
+ ],
+ [
+ -73.940433,
+ 41.697539
+ ],
+ [
+ -73.941444,
+ 41.699929
+ ],
+ [
+ -73.940356,
+ 41.706856
+ ],
+ [
+ -73.940277,
+ 41.711203
+ ],
+ [
+ -73.939545,
+ 41.713302
+ ],
+ [
+ -73.938939,
+ 41.719455
+ ],
+ [
+ -73.937675,
+ 41.72375
+ ],
+ [
+ -73.937258,
+ 41.727069
+ ],
+ [
+ -73.935901,
+ 41.731424
+ ],
+ [
+ -73.937023,
+ 41.735492
+ ],
+ [
+ -73.935714,
+ 41.735885
+ ],
+ [
+ -73.937112,
+ 41.738053
+ ],
+ [
+ -73.936216,
+ 41.743008
+ ],
+ [
+ -73.931053,
+ 41.743208
+ ],
+ [
+ -73.930416,
+ 41.740548
+ ],
+ [
+ -73.924398,
+ 41.742522
+ ],
+ [
+ -73.923774,
+ 41.740166
+ ],
+ [
+ -73.917519,
+ 41.739537
+ ],
+ [
+ -73.917575,
+ 41.74324
+ ],
+ [
+ -73.913801,
+ 41.744196
+ ],
+ [
+ -73.911852,
+ 41.743994
+ ],
+ [
+ -73.911706,
+ 41.746844
+ ],
+ [
+ -73.909545,
+ 41.749519
+ ],
+ [
+ -73.908145,
+ 41.747949
+ ],
+ [
+ -73.907639,
+ 41.748959
+ ],
+ [
+ -73.900824,
+ 41.751214
+ ],
+ [
+ -73.898629,
+ 41.749824
+ ],
+ [
+ -73.89801,
+ 41.752612
+ ],
+ [
+ -73.898875,
+ 41.75452
+ ],
+ [
+ -73.902461,
+ 41.754866
+ ],
+ [
+ -73.903116,
+ 41.757675
+ ],
+ [
+ -73.902603,
+ 41.759205
+ ],
+ [
+ -73.906561,
+ 41.76051
+ ],
+ [
+ -73.906466,
+ 41.761862
+ ],
+ [
+ -73.908172,
+ 41.765535
+ ],
+ [
+ -73.898585,
+ 41.76521
+ ],
+ [
+ -73.896256,
+ 41.7613
+ ],
+ [
+ -73.890659,
+ 41.761534
+ ],
+ [
+ -73.88563,
+ 41.773969
+ ],
+ [
+ -73.893727,
+ 41.778592
+ ],
+ [
+ -73.893867,
+ 41.777261
+ ],
+ [
+ -73.896532,
+ 41.77592
+ ],
+ [
+ -73.897412,
+ 41.77467
+ ],
+ [
+ -73.897028,
+ 41.773412
+ ],
+ [
+ -73.900515,
+ 41.77437
+ ],
+ [
+ -73.901635,
+ 41.772922
+ ],
+ [
+ -73.902636,
+ 41.770094
+ ],
+ [
+ -73.903966,
+ 41.770252
+ ],
+ [
+ -73.903177,
+ 41.768578
+ ],
+ [
+ -73.905059,
+ 41.768288
+ ],
+ [
+ -73.904999,
+ 41.76985
+ ],
+ [
+ -73.908987,
+ 41.76994
+ ],
+ [
+ -73.909271,
+ 41.771089
+ ],
+ [
+ -73.904888,
+ 41.770976
+ ],
+ [
+ -73.903111,
+ 41.772921
+ ],
+ [
+ -73.900532,
+ 41.774839
+ ],
+ [
+ -73.898981,
+ 41.777051
+ ],
+ [
+ -73.896157,
+ 41.779008
+ ],
+ [
+ -73.8946,
+ 41.779054
+ ],
+ [
+ -73.893865,
+ 41.781218
+ ],
+ [
+ -73.891245,
+ 41.781913
+ ],
+ [
+ -73.888377,
+ 41.781345
+ ],
+ [
+ -73.887574,
+ 41.781734
+ ],
+ [
+ -73.885087,
+ 41.781825
+ ],
+ [
+ -73.870334,
+ 41.779003
+ ],
+ [
+ -73.868885,
+ 41.770668
+ ],
+ [
+ -73.869187,
+ 41.767579
+ ],
+ [
+ -73.871438,
+ 41.765031
+ ],
+ [
+ -73.873716,
+ 41.76455
+ ],
+ [
+ -73.87445,
+ 41.765686
+ ],
+ [
+ -73.874285,
+ 41.763457
+ ],
+ [
+ -73.876017,
+ 41.763473
+ ],
+ [
+ -73.876876,
+ 41.762832
+ ],
+ [
+ -73.876726,
+ 41.762482
+ ],
+ [
+ -73.876442,
+ 41.761963
+ ],
+ [
+ -73.877215,
+ 41.761713
+ ],
+ [
+ -73.877544,
+ 41.761825
+ ],
+ [
+ -73.877909,
+ 41.762062
+ ],
+ [
+ -73.878194,
+ 41.76185
+ ],
+ [
+ -73.877342,
+ 41.761462
+ ],
+ [
+ -73.878599,
+ 41.758345
+ ],
+ [
+ -73.878145,
+ 41.755284
+ ],
+ [
+ -73.876575,
+ 41.75593
+ ],
+ [
+ -73.874392,
+ 41.755638
+ ],
+ [
+ -73.874565,
+ 41.752187
+ ],
+ [
+ -73.865445,
+ 41.75315
+ ],
+ [
+ -73.865545,
+ 41.75103
+ ],
+ [
+ -73.860834,
+ 41.750663
+ ],
+ [
+ -73.86099,
+ 41.751555
+ ],
+ [
+ -73.860793,
+ 41.753604
+ ],
+ [
+ -73.85537,
+ 41.753406
+ ],
+ [
+ -73.855903,
+ 41.756536
+ ],
+ [
+ -73.854792,
+ 41.756596
+ ],
+ [
+ -73.854365,
+ 41.757905
+ ],
+ [
+ -73.852813,
+ 41.757352
+ ],
+ [
+ -73.853324,
+ 41.756355
+ ],
+ [
+ -73.851761,
+ 41.755863
+ ],
+ [
+ -73.847576,
+ 41.756682
+ ],
+ [
+ -73.848473,
+ 41.749617
+ ],
+ [
+ -73.849387,
+ 41.74793
+ ],
+ [
+ -73.849242,
+ 41.745289
+ ],
+ [
+ -73.85343,
+ 41.742244
+ ],
+ [
+ -73.852278,
+ 41.735793
+ ],
+ [
+ -73.86038,
+ 41.735994
+ ],
+ [
+ -73.861214,
+ 41.734363
+ ],
+ [
+ -73.862342,
+ 41.734776
+ ],
+ [
+ -73.867625,
+ 41.735696
+ ],
+ [
+ -73.868232,
+ 41.736194
+ ],
+ [
+ -73.878752,
+ 41.736191
+ ],
+ [
+ -73.879146,
+ 41.736489
+ ],
+ [
+ -73.882648,
+ 41.737218
+ ],
+ [
+ -73.882878,
+ 41.737395
+ ],
+ [
+ -73.883464,
+ 41.73692
+ ],
+ [
+ -73.883993,
+ 41.736318
+ ],
+ [
+ -73.897166,
+ 41.736634
+ ],
+ [
+ -73.897961,
+ 41.734863
+ ],
+ [
+ -73.897673,
+ 41.732112
+ ],
+ [
+ -73.898574,
+ 41.730567
+ ],
+ [
+ -73.897281,
+ 41.730137
+ ],
+ [
+ -73.897477,
+ 41.725864
+ ],
+ [
+ -73.8994,
+ 41.723955
+ ],
+ [
+ -73.903981,
+ 41.715716
+ ],
+ [
+ -73.903934,
+ 41.71432
+ ],
+ [
+ -73.902572,
+ 41.714535
+ ],
+ [
+ -73.904018,
+ 41.708193
+ ],
+ [
+ -73.905956,
+ 41.70871
+ ],
+ [
+ -73.904119,
+ 41.705482
+ ],
+ [
+ -73.906248,
+ 41.702342
+ ],
+ [
+ -73.904722,
+ 41.702125
+ ],
+ [
+ -73.904311,
+ 41.70095
+ ],
+ [
+ -73.906073,
+ 41.698772
+ ],
+ [
+ -73.905862,
+ 41.696897
+ ],
+ [
+ -73.908493,
+ 41.697463
+ ],
+ [
+ -73.908812,
+ 41.696556
+ ],
+ [
+ -73.915681,
+ 41.698216
+ ],
+ [
+ -73.917225,
+ 41.697395
+ ],
+ [
+ -73.918106,
+ 41.695461
+ ],
+ [
+ -73.917819,
+ 41.690964
+ ],
+ [
+ -73.915533,
+ 41.689466
+ ],
+ [
+ -73.915454,
+ 41.688108
+ ],
+ [
+ -73.918657,
+ 41.683164
+ ],
+ [
+ -73.918453,
+ 41.679966
+ ],
+ [
+ -73.921132,
+ 41.679541
+ ],
+ [
+ -73.924001,
+ 41.679824
+ ],
+ [
+ -73.923741,
+ 41.675312
+ ],
+ [
+ -73.920184,
+ 41.675159
+ ],
+ [
+ -73.920231,
+ 41.672802
+ ],
+ [
+ -73.922265,
+ 41.672617
+ ],
+ [
+ -73.922269,
+ 41.671769
+ ],
+ [
+ -73.915317,
+ 41.671221
+ ],
+ [
+ -73.914172,
+ 41.668195
+ ],
+ [
+ -73.915603,
+ 41.668089
+ ],
+ [
+ -73.9172,
+ 41.66609
+ ],
+ [
+ -73.916054,
+ 41.665284
+ ],
+ [
+ -73.917255,
+ 41.663905
+ ],
+ [
+ -73.921687,
+ 41.663906
+ ],
+ [
+ -73.924653,
+ 41.661306
+ ],
+ [
+ -73.930132,
+ 41.661314
+ ],
+ [
+ -73.930664,
+ 41.656334
+ ],
+ [
+ -73.930278,
+ 41.654148
+ ],
+ [
+ -73.928328,
+ 41.651414
+ ],
+ [
+ -73.927079,
+ 41.652716
+ ],
+ [
+ -73.925138,
+ 41.652858
+ ],
+ [
+ -73.924076,
+ 41.654553
+ ],
+ [
+ -73.917284,
+ 41.654049
+ ],
+ [
+ -73.91415,
+ 41.651632
+ ],
+ [
+ -73.910205,
+ 41.651471
+ ],
+ [
+ -73.912263,
+ 41.649108
+ ],
+ [
+ -73.910049,
+ 41.6487
+ ],
+ [
+ -73.902619,
+ 41.644231
+ ],
+ [
+ -73.89922,
+ 41.64236
+ ],
+ [
+ -73.900618,
+ 41.639031
+ ],
+ [
+ -73.904805,
+ 41.639512
+ ],
+ [
+ -73.909611,
+ 41.629043
+ ],
+ [
+ -73.909229,
+ 41.627952
+ ],
+ [
+ -73.90871,
+ 41.629871
+ ],
+ [
+ -73.907423,
+ 41.630891
+ ],
+ [
+ -73.906986,
+ 41.628231
+ ],
+ [
+ -73.905025,
+ 41.627918
+ ],
+ [
+ -73.903067,
+ 41.626792
+ ],
+ [
+ -73.904821,
+ 41.624779
+ ],
+ [
+ -73.909973,
+ 41.62598
+ ],
+ [
+ -73.912601,
+ 41.623447
+ ],
+ [
+ -73.917652,
+ 41.62391
+ ],
+ [
+ -73.917346,
+ 41.62072
+ ],
+ [
+ -73.915826,
+ 41.616514
+ ],
+ [
+ -73.916928,
+ 41.614733
+ ],
+ [
+ -73.918104,
+ 41.616275
+ ],
+ [
+ -73.917843,
+ 41.618462
+ ],
+ [
+ -73.919027,
+ 41.620224
+ ],
+ [
+ -73.91912,
+ 41.623561
+ ],
+ [
+ -73.917676,
+ 41.624459
+ ],
+ [
+ -73.916993,
+ 41.627051
+ ],
+ [
+ -73.91866,
+ 41.628367
+ ],
+ [
+ -73.920508,
+ 41.630187
+ ],
+ [
+ -73.92256,
+ 41.629392
+ ],
+ [
+ -73.923897,
+ 41.62993
+ ],
+ [
+ -73.925188,
+ 41.629143
+ ],
+ [
+ -73.925076,
+ 41.627656
+ ],
+ [
+ -73.927584,
+ 41.623201
+ ],
+ [
+ -73.931361,
+ 41.623446
+ ],
+ [
+ -73.933154,
+ 41.622071
+ ],
+ [
+ -73.934497,
+ 41.62001
+ ],
+ [
+ -73.938007,
+ 41.61787
+ ],
+ [
+ -73.941727,
+ 41.618184
+ ],
+ [
+ -73.945018,
+ 41.617406
+ ],
+ [
+ -73.946521,
+ 41.615536
+ ],
+ [
+ -73.947272,
+ 41.616144
+ ],
+ [
+ -73.948913,
+ 41.619325
+ ],
+ [
+ -73.947611,
+ 41.631138
+ ]
+ ],
+ [
+ [
+ -73.9284,
+ 41.67678
+ ],
+ [
+ -73.926493,
+ 41.676669
+ ],
+ [
+ -73.92523,
+ 41.679721
+ ],
+ [
+ -73.927457,
+ 41.677887
+ ],
+ [
+ -73.928656,
+ 41.677773
+ ],
+ [
+ -73.9284,
+ 41.67678
+ ]
+ ]
+ ]
+ ]
+ }
+
\ No newline at end of file
diff --git a/tests/mocks.py b/tests/mocks.py
new file mode 100644
index 00000000..06f84a30
--- /dev/null
+++ b/tests/mocks.py
@@ -0,0 +1,42 @@
+from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
+
+
+class MockPlace:
+ """Used to test AuthenticationDocument.parse_coverage."""
+ AMBIGUOUS = object() # Used to indicate that a place name is ambiguous.
+ EVERYWHERE = object() # Used to indicate coverage through the universe or through a country.
+
+ # Used within a test to provide a starting point for place names that don't mention a nation.
+ _default_nation = None
+
+ by_name = dict()
+
+ def __init__(self, inside=None):
+ self.inside = inside or dict()
+ self.abbreviated_name = None
+
+ @classmethod
+ def default_nation(cls, _db):
+ return cls._default_nation
+
+ @classmethod
+ def lookup_one_by_name(cls, _db, name, place_type):
+ place = cls.by_name.get(name)
+ if place is cls.AMBIGUOUS:
+ raise MultipleResultsFound()
+ if place is None:
+ raise NoResultFound()
+ print("%s->%s" % (name, place))
+ return place
+
+ def lookup_inside(self, name):
+ place = self.inside.get(name)
+ if place is self.AMBIGUOUS:
+ raise MultipleResultsFound()
+ if place is None:
+ raise NoResultFound()
+ return place
+
+ @classmethod
+ def everywhere(cls, _db):
+ return cls.EVERYWHERE
diff --git a/tests/models/__init__.py b/tests/models/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/models/test_library.py b/tests/models/test_library.py
new file mode 100644
index 00000000..59cd7a3d
--- /dev/null
+++ b/tests/models/test_library.py
@@ -0,0 +1,735 @@
+import json
+import random
+import re
+import uuid
+
+import pytest
+
+from constants import LibraryType
+from model import (
+ DelegatedPatronIdentifier,
+ Hyperlink,
+ Library,
+ Place,
+)
+from util.geo import Location
+
+
+GENERATED_SHORT_NAME_REGEX = re.compile(r'^[A-Z]{6}$')
+
+##############################################################################
+# Note: The test_nearby_* functions rely on Libraries and Places created
+# by the following fixtures. The locations are in central Kansas, USA (for
+# no other reason than it's square and grid-like out there, so was
+# easy to eyeball locations in Google Maps). They are laid out like the
+# following diagram. Each of the points, P1-P6, are labeled with their
+# respective distance ordering of libraries A, B, and C.
+#
+# P1(ABC)
+#
+#
+#
+#
+#
+# P6(BAC) Lib A P2(ACB)
+# (Beloit, KS)
+#
+#
+#
+# Lib B
+# (Russell, KS)
+#
+#
+#
+#
+# P5(BCA) Lib C P3(CAB)
+# (Hutchinson, KS)
+#
+#
+#
+#
+# P4(CBA)
+#
+##############################################################################
+
+
+def latlong_square_polygon(latitude, longitude, offset=0.02):
+ """
+ For a given lat/long centerpoint, returns five coordinate
+ pairs that describe a square whose edges are 0.02 (or `offset`) degrees
+ out from that point.
+
+ The return list is five elements because a GeoJSON polygon
+ is described by a closed ring, so the first and last coordinates
+ must be the same. The multiple nesting levels are also a GeoJSON requirement.
+
+ Note: This isn't a general purpose function, it probably only
+ works for points in North America that are positive latitude,
+ negative longitude. I just needed some boxes in Kansas.
+ """
+ return [[
+ [round(longitude - offset, 6), round(latitude + offset, 6)],
+ [round(longitude + offset, 6), round(latitude + offset, 6)],
+ [round(longitude + offset, 6), round(latitude - offset, 6)],
+ [round(longitude - offset, 6), round(latitude - offset, 6)],
+ [round(longitude - offset, 6), round(latitude + offset, 6)], # same as the first point
+ ]]
+
+
+@pytest.fixture
+def nearby_lib_a(db_session, create_test_place, create_test_library):
+ """Library whose service area is a rectangle around Beloit, KS"""
+ (latitude, longitude) = (39.465359, -98.109062)
+ libname = "ALPHA"
+ svc_area_geometry = {"type": "Polygon", "coordinates": latlong_square_polygon(latitude, longitude)}
+ svc_area = create_test_place(db_session, external_id=f"lib_{libname}_svc_area", place_type=Place.CITY,
+ geometry=json.dumps(svc_area_geometry))
+ lib = create_test_library(db_session, library_name=libname, focus_areas=[svc_area],
+ eligibility_areas=[svc_area])
+ db_session.commit()
+ yield lib
+ db_session.delete(lib)
+ db_session.delete(svc_area)
+ db_session.commit()
+
+
+@pytest.fixture
+def nearby_lib_b(db_session, create_test_place, create_test_library):
+ """Library whose service area is a rectangle around Russell, KS"""
+ (latitude, longitude) = (38.892131, -98.856232)
+ libname = "BRAVO"
+ svc_area_geometry = {"type": "Polygon", "coordinates": latlong_square_polygon(latitude, longitude)}
+ svc_area = create_test_place(db_session, external_id=f"lib_{libname}_svc_area", place_type=Place.CITY,
+ geometry=json.dumps(svc_area_geometry))
+ lib = create_test_library(db_session, library_name=libname, focus_areas=[svc_area],
+ eligibility_areas=[svc_area])
+ db_session.commit()
+ yield lib
+ db_session.delete(lib)
+ db_session.delete(svc_area)
+ db_session.commit()
+
+
+@pytest.fixture
+def nearby_lib_c(db_session, create_test_place, create_test_library):
+ """Library whose service area is a rectangle around Hutchinson, KS"""
+ (latitude, longitude) = (38.068448, -97.921910)
+ libname = "CHARLIE"
+ svc_area_geometry = {"type": "Polygon", "coordinates": latlong_square_polygon(latitude, longitude)}
+ svc_area = create_test_place(db_session, external_id=f"lib_{libname}_svc_area", place_type=Place.CITY,
+ geometry=json.dumps(svc_area_geometry))
+ lib = create_test_library(db_session, library_name=libname, focus_areas=[svc_area],
+ eligibility_areas=[svc_area])
+ db_session.commit()
+ yield lib
+ db_session.delete(lib)
+ db_session.delete(svc_area)
+ db_session.commit()
+
+
+@pytest.fixture
+def nearby_libs(nearby_lib_a, nearby_lib_b, nearby_lib_c):
+ """All three nearby_lib_* fixtures in a dict"""
+ return {
+ "nearby_lib_a": nearby_lib_a,
+ "nearby_lib_b": nearby_lib_b,
+ "nearby_lib_c": nearby_lib_c,
+ }
+
+
+@pytest.fixture
+def state_lib_d(db_session, create_test_place, create_test_library):
+ """Library whose service area is the western half of Kansas"""
+ libname = "DELTA"
+ svc_area_geometry = {
+ "type": "Polygon",
+ "coordinates": [[
+ [-102.049880, 39.999859],
+ [-98.535992, 39.998648],
+ [-98.535992, 36.990382],
+ [-102.041553, 36.990382],
+ [-102.049880, 39.999859],
+ ]]
+ }
+ svc_area = create_test_place(db_session, external_id=f"lib_{libname}_svc_area",
+ place_type=Place.STATE, geometry=json.dumps(svc_area_geometry))
+ lib = create_test_library(db_session, library_name=libname, focus_areas=[svc_area],
+ eligibility_areas=[svc_area])
+ db_session.commit()
+ yield lib
+ db_session.delete(lib)
+ db_session.delete(svc_area)
+ db_session.commit()
+
+
+@pytest.fixture
+def state_lib_e(db_session, create_test_place, create_test_library):
+ """Library whose service area is the eastern half of Kansas"""
+ libname = "ECHO"
+ svc_area_geometry = {
+ "type": "Polygon",
+ "coordinates": [[
+ [-98.535992, 39.998648],
+ [-94.876420, 39.998648],
+ [-94.876420, 36.990382],
+ [-98.535992, 36.990382],
+ [-98.535992, 39.998648],
+ ]]
+ }
+ svc_area = create_test_place(db_session, external_id=f"lib_{libname}_svc_area",
+ place_type=Place.STATE, geometry=json.dumps(svc_area_geometry))
+ lib = create_test_library(db_session, library_name=libname, focus_areas=[svc_area],
+ eligibility_areas=[svc_area])
+ db_session.commit()
+ yield lib
+ db_session.delete(lib)
+ db_session.delete(svc_area)
+ db_session.commit()
+
+
+@pytest.fixture
+def state_lib_f(db_session, create_test_place, create_test_library):
+ """Library whose service area is the state of Colorado"""
+ libname = "FOXTROT"
+ svc_area_geometry = {
+ "type": "Polygon",
+ "coordinates": [[
+ [-109.060023, 41.001758],
+ [-102.040416, 41.001758],
+ [-102.040416, 37.004643],
+ [-109.060023, 37.004643],
+ [-109.060023, 41.001758],
+ ]]
+ }
+ svc_area = create_test_place(db_session, external_id=f"lib_{libname}_svc_area",
+ place_type=Place.STATE, geometry=json.dumps(svc_area_geometry))
+ lib = create_test_library(db_session, library_name=libname, focus_areas=[svc_area],
+ eligibility_areas=[svc_area])
+ db_session.commit()
+ yield lib
+ db_session.delete(lib)
+ db_session.delete(svc_area)
+ db_session.commit()
+
+
+@pytest.fixture
+def state_libs(state_lib_d, state_lib_e, state_lib_f):
+ """All state level libraries in a dict"""
+ return {
+ "state_lib_d": state_lib_d,
+ "state_lib_e": state_lib_e,
+ "state_lib_f": state_lib_f,
+ }
+
+
+class TestLibraryModel:
+ def test_short_name_validation(self, nypl):
+ """
+ GIVEN: An existing Library object
+ WHEN: The .short_name field of that object is set to a string containing a pipe
+ THEN: A ValueError is raised
+ """
+ with pytest.raises(ValueError) as exc:
+ nypl.short_name = "ab|cd"
+ assert "Short name cannot contain the pipe character" in str(exc.value)
+
+ def test_for_short_name(self, db_session, nypl):
+ """
+ GIVEN: An existing Library with a given short_name value
+ WHEN: The Library.for_short_name() class method is called with that short_name value
+ THEN: The appropriate Library object should be returned
+ """
+ assert Library.for_short_name(db_session, 'NYPL') == nypl
+
+ def test_for_urn(self, db_session, nypl):
+ """
+ GIVEN: An existing library with a given internal_urn value
+ WHEN: The Library.for_urn() class method is called with that internal_urn value
+ THEN: The appropriate Library object should be returned
+ """
+ assert Library.for_urn(db_session, nypl.internal_urn) == nypl
+
+ def test_random_short_name(self):
+ """
+ GIVEN: A pre-determined seed for the Python random library
+ WHEN: The Library.random_short_name() class method is called
+ THEN: A seed-determined value or values are generated which are six ascii uppercase characters
+ """
+ random.seed(42)
+ SEED_42_FIRST_VALUE = "UDAXIH"
+ generated_name = Library.random_short_name()
+ assert generated_name == SEED_42_FIRST_VALUE
+ assert re.match
+
+ def test_random_short_name_duplicate_check(self):
+ """
+ GIVEN: A duplicate check function indicating a seeded name is already in use
+ WHEN: The Library.random_short_name() function is called with that function
+ THEN: The next seeded name value should be returned
+ """
+ random.seed(42)
+ SEED_42_FIRST_VALUE = "UDAXIH"
+ SEED_42_SECOND_VALUE = "HEXDVX"
+
+ assert Library.random_short_name() == SEED_42_FIRST_VALUE # Call once to move past initial value
+ name = Library.random_short_name(duplicate_check=lambda x: x == SEED_42_FIRST_VALUE)
+ assert name == SEED_42_SECOND_VALUE
+
+ def test_random_short_name_quit_after_20_attempts(self):
+ """
+ GIVEN: A duplicate check function which always indicates a duplicate name exists
+ WHEN: Library.random_short_name() is called with that duplicate check
+ THEN: A ValueError should be raised indicating no short name could be generated
+ """
+ with pytest.raises(ValueError) as exc:
+ Library.random_short_name(duplicate_check=lambda x: True)
+ assert "Could not generate random short name after 20 attempts!" in str(exc.value)
+
+ def test_set_library_stage(self, db_session, nypl):
+ """
+ GIVEN: An existing Library that the registry has put in production
+ WHEN: An attempt is made to set the .library_stage for that Library
+ THEN: A ValueError should be raised, because the .registry_stage gates .library_stage
+ """
+ # The .library_stage may not be changed while .registry_stage is PRODUCTION_STAGE
+ with pytest.raises(ValueError) as exc:
+ nypl.library_stage = Library.TESTING_STAGE
+ assert "This library is already in production" in str(exc.value)
+
+ # Have the registry take the library out of production.
+ nypl.registry_stage = Library.CANCELLED_STAGE
+ assert nypl.in_production is False
+
+ # Now we can change the library stage however we want.
+ nypl.library_stage = Library.TESTING_STAGE
+ nypl.library_stage = Library.CANCELLED_STAGE
+ nypl.library_stage = Library.PRODUCTION_STAGE
+
+ def test_in_production(self, nypl):
+ """
+ GIVEN: An existing Library in PRODUCTION_STAGE
+ WHEN: Either .registry_stage or .library_stage is set to CANCELLED_STAGE
+ THEN: The Library's .in_production property should return False
+ """
+ assert nypl.library_stage == Library.PRODUCTION_STAGE
+ assert nypl.registry_stage == Library.PRODUCTION_STAGE
+ assert nypl.in_production is True
+
+ # If either library_stage or registry stage is not
+ # PRODUCTION_STAGE, we are not in production.
+ nypl.registry_stage = Library.CANCELLED_STAGE
+ assert nypl.in_production is False
+
+ nypl.library_stage = Library.CANCELLED_STAGE
+ assert nypl.in_production is False
+
+ nypl.registry_stage = Library.PRODUCTION_STAGE
+ assert nypl.in_production is False
+
+ def test_number_of_patrons(self, db_session, create_test_library):
+ """
+ GIVEN: A newly created Library in Producion stage
+ WHEN: A DelegatedPatronIdentifier with an Adobe Account ID is associated with that Library
+ THEN: The Library's .number_of_patrons property should reflect that patron
+ """
+ lib = create_test_library(db_session)
+ assert lib.number_of_patrons == 0
+ (identifier, _) = DelegatedPatronIdentifier.get_one_or_create(
+ db_session, lib, str(uuid.uuid4()), DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID, None
+ )
+ assert lib.number_of_patrons == 1
+
+ db_session.delete(lib)
+ db_session.delete(identifier)
+ db_session.commit()
+
+ def test_number_of_patrons_non_adobe(self, db_session, create_test_library):
+ """
+ GIVEN: A newly created Library in Production stage
+ WHEN: A DelegatedPatronIdentifier without an Adobe Account ID is associated with that Library
+ THEN: The Library's .number_of_patrons property should not increase
+ """
+ lib = create_test_library(db_session)
+ (identifier, _) = DelegatedPatronIdentifier.get_one_or_create(
+ db_session, lib, str(uuid.uuid4()), "abc", None
+ )
+ assert lib.number_of_patrons == 0
+
+ db_session.delete(lib)
+ db_session.delete(identifier)
+ db_session.commit()
+
+ def test_number_of_patrons_non_production_stage(self, db_session, create_test_library):
+ """
+ GIVEN: A newly created Library in Testing stage
+ WHEN: A DelegatedPatronIdentifier is created referencing that Library
+ THEN: The Library's .number_of_patrons property should not increase, since identifiers
+ cannot be assigned to libraries not in production.
+ """
+ lib = create_test_library(db_session, library_stage=Library.TESTING_STAGE)
+ (identifier, _) = DelegatedPatronIdentifier.get_one_or_create(
+ db_session, lib, str(uuid.uuid4()), DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID, None
+ )
+ assert lib.number_of_patrons == 0
+
+ db_session.delete(lib)
+ db_session.delete(identifier)
+ db_session.commit()
+
+ def test__feed_restriction_production_stage(self, db_session, create_test_library):
+ """
+ GIVEN: A Library object whose .registry_stage and .library_stage are both PRODUCTION_STAGE
+ WHEN: The Library._feed_restriction() method is used to filter a Library query
+ THEN: That Production library should be in the result set no matter what boolean value is
+ passed to _feed_restriction()
+ """
+ library = create_test_library(db_session)
+ assert library.library_stage == Library.PRODUCTION_STAGE
+ assert library.registry_stage == Library.PRODUCTION_STAGE
+
+ # A library in PRODUCTION_STAGE should not be removed by feed restriction
+ q = db_session.query(Library)
+ assert q.filter(Library._feed_restriction(production=True)).all() == [library]
+ assert q.filter(Library._feed_restriction(production=False)).all() == [library]
+
+ db_session.delete(library)
+ db_session.commit()
+
+ def test__feed_restriction_mixed_stages(self, db_session, create_test_library):
+ """
+ GIVEN: A Library object with:
+ - .registry_stage set to TESTING_STAGE
+ - .library_stage set to PRODUCTION_STAGE
+ WHEN: The Library._feed_restriction() method is used to filter a Library query
+ THEN: The Library should only be returned when the 'production' parameter for
+ _feed_restriction() is set to False
+ """
+ library = create_test_library(db_session)
+ library.registry_stage = Library.TESTING_STAGE
+
+ q = db_session.query(Library)
+ assert library.registry_stage != library.library_stage
+ assert q.filter(Library._feed_restriction(production=True)).all() == []
+ assert q.filter(Library._feed_restriction(production=False)).all() == [library]
+
+ db_session.delete(library)
+ db_session.commit()
+
+ def test__feed_restriction_testing_stage(self, db_session, create_test_library):
+ """
+ GIVEN: A Library object in TESTING_STAGE for both .library_stage and .registry_stage
+ WHEN: The Library._feed_restriction() method is used to filter a Library query
+ THEN: The Library should be returned in a testing feed, but not a production feed
+ """
+ library = create_test_library(db_session)
+ library.registry_stage = Library.TESTING_STAGE
+ library.library_stage = Library.TESTING_STAGE
+
+ q = db_session.query(Library)
+ assert q.filter(Library._feed_restriction(production=True)).all() == []
+ assert q.filter(Library._feed_restriction(production=False)).all() == [library]
+
+ db_session.delete(library)
+ db_session.commit()
+
+ def test__feed_restriction_cancelled_stage(self, db_session, create_test_library):
+ """
+ GIVEN: A Library object in CANCELLED_STAGE (for either or both of registry_stage/library_stage)
+ WHEN: The Library._feed_restriction() method is used to filter a Library query
+ THEN: The Library should not be returned in either testing or production feeds
+ """
+ library = create_test_library(db_session)
+ library.registry_stage = Library.CANCELLED_STAGE
+ library.library_stage = Library.CANCELLED_STAGE
+ q = db_session.query(Library)
+ assert q.filter(Library._feed_restriction(production=True)).all() == []
+ assert q.filter(Library._feed_restriction(production=False)).all() == []
+
+ db_session.delete(library)
+ db_session.commit()
+
+ def test_set_hyperlink_exceptions(self, db_session, create_test_library):
+ """
+ GIVEN: An existing Library
+ WHEN: The .set_hyperlink() method is called without all necessary parameters
+ THEN: Appropriate exceptions should be raised
+ """
+ library = create_test_library(db_session)
+
+ with pytest.raises(ValueError) as exc:
+ library.set_hyperlink("rel")
+ assert "No Hyperlink hrefs were specified" in str(exc.value)
+
+ with pytest.raises(ValueError) as exc:
+ library.set_hyperlink(None, ["href"])
+ assert "No link relation was specified" in str(exc.value)
+
+ db_session.delete(library)
+ db_session.commit()
+
+ def test_set_hyperlink(self, db_session, create_test_library):
+ """
+ GIVEN: An existing Library object
+ WHEN: .set_hyperlink is called with sufficient arguments
+ THEN: A Hyperlink object should be returned, with is_modified True
+ """
+ library = create_test_library(db_session)
+ (link, is_modified) = library.set_hyperlink("rel", "href1", "href2")
+ assert isinstance(link, Hyperlink)
+ assert is_modified is True
+ assert link.rel == "rel"
+ assert link.href == "href1"
+ assert link.library_id == library.id
+
+ db_session.delete(library)
+ db_session.delete(link)
+ db_session.commit()
+
+ def test_set_hyperlink_multiple_calls(self, db_session, create_test_library):
+ """
+ GIVEN: An existing Library object
+ WHEN: .set_hyperlink is called multiple times, with href parameters in different orders
+ THEN: The href set as default in the original link creation will remain the return value of .href
+ """
+ library = create_test_library(db_session)
+ (link_original, _) = library.set_hyperlink("rel", "href1", "href2")
+ # Calling set_hyperlink again does not modify the link so long as the old href is still a possibility.
+ (link_new, is_modified) = library.set_hyperlink("rel", "href2", "href1")
+ assert link_original == link_new
+ assert link_new.rel == "rel"
+ assert link_new.href == "href1"
+ assert is_modified is False
+
+ db_session.delete(library)
+ db_session.delete(link_original)
+ db_session.commit()
+
+ def test_set_hyperlink_overwrite_href(self, db_session, create_test_library):
+ """
+ GIVEN: An existing Library object with a hyperlink with a specific href value
+ WHEN: A subsequent call to .set_hyperlink() provides hrefs which do not include the existing href value
+ THEN: The .href of that Hyperlink will be set to the first of the new values
+ """
+ library = create_test_library(db_session)
+ (link_original, _) = library.set_hyperlink("rel", "href1", "href2")
+ (link_modified, is_modified) = library.set_hyperlink("rel", "href2", "href3")
+ assert is_modified is True
+ assert link_original == link_modified
+ assert link_modified.rel == "rel"
+ assert link_modified.href == "href2"
+
+ db_session.delete(library)
+ db_session.delete(link_original)
+ db_session.commit()
+
+ def test_set_hyperlink_one_link_rel_per_library(self, db_session, create_test_library):
+ """
+ GIVEN: An existing Library object with a hyperlink for a specific rel name
+ WHEN: A second call to .set_hyperlink() is made with the same rel name
+ THEN: The existing hyperlink is either returned or modified--there is never more
+ than one hyperlink for a given rel at the same Library
+ """
+ library = create_test_library(db_session)
+ (link_original, _) = library.set_hyperlink("rel", "href1", "href2")
+ (link_modified, is_modified) = library.set_hyperlink("rel", "href2", "href3")
+
+ assert library.hyperlinks == [link_modified]
+
+ db_session.delete(library)
+ db_session.delete(link_original)
+ db_session.commit()
+
+ def test_set_hyperlink_multiple_hyperlinks_same_resource(self, db_session, create_test_library):
+ """
+ GIVEN: An existing Library object with a hyperlink for a specific rel name
+ WHEN: A second call to .set_hyperlink() is made, for the same resource but a different rel name
+ THEN: A second hyperlink should be created
+ """
+ library = create_test_library(db_session)
+ (link_original, _) = library.set_hyperlink("rel_alpha", "href1")
+ (link_new, modified) = library.set_hyperlink("rel_bravo", "href1")
+ assert link_original.resource == link_new.resource
+ assert modified is True
+
+ db_session.delete(library)
+ db_session.delete(link_original)
+ db_session.delete(link_new)
+ db_session.commit()
+
+ def test_set_hyperlink_two_libraries_link_same_resource_same_rel(self, db_session, create_test_library):
+ """
+ GIVEN: Two different Library objects:
+ - One with an existing hyperlink to a specific rel/resource
+ - One without a hyperlink to that rel/resource
+ WHEN: .set_hyperlink() is called for the second library with the same rel/resource
+ THEN: A Hyperlink is successfully created for the second library, with an identical
+ rel/resource as for the first library
+ """
+ link_args = ["some-rel-name", "href-to-resource-001"]
+ library_alpha = create_test_library(db_session)
+ library_bravo = create_test_library(db_session)
+ (link_alpha, is_alpha_modified) = library_alpha.set_hyperlink(*link_args)
+ assert isinstance(link_alpha, Hyperlink)
+ assert is_alpha_modified is True
+ assert link_alpha.library_id == library_alpha.id
+
+ (link_bravo, is_bravo_modified) = library_bravo.set_hyperlink(*link_args)
+ assert isinstance(link_bravo, Hyperlink)
+ assert is_bravo_modified is True
+ assert link_bravo.library_id == library_bravo.id
+
+ assert link_alpha.href == link_bravo.href
+ assert link_alpha.rel == link_bravo.rel
+
+ for item in [library_alpha, library_bravo, link_alpha, link_bravo]:
+ db_session.delete(item)
+ db_session.commit()
+
+ def test_get_hyperlink(self, db_session, create_test_library):
+ """
+ GIVEN: An existing Library object
+ WHEN: A hyperlink is created associated with that Library for a given rel name
+ THEN: A subsequent call to Library.get_hyperlink() referencing that Library and
+ rel name should return an appropriate Hyperlink object
+ """
+ library = create_test_library(db_session)
+ (link1, _) = library.set_hyperlink("contact_email", "contact_href")
+ (link2, _) = library.set_hyperlink("help_email", "help_href")
+
+ contact_link = Library.get_hyperlink(library, "contact_email")
+ assert isinstance(contact_link, Hyperlink)
+ assert link1 == contact_link
+
+ help_link = Library.get_hyperlink(library, "help_email")
+ assert isinstance(help_link, Hyperlink)
+ assert link2 == help_link
+
+ for item in [library, link1, link2]:
+ db_session.delete(item)
+ db_session.commit()
+
+ @pytest.mark.skip(reason="Need to implement")
+ def test_patron_counts_by_library(self):
+ """
+ GIVEN: Multiple existing Libraries, each with some number of patrons
+ WHEN: Library.patron_counts_by_library() is passed a list of instances representing those Libraries
+ THEN: A dictionary should be returned with library_id: count entries
+ """
+
+ def test_library_service_area(self, db_session, create_test_library, create_test_place):
+ """
+ GIVEN: An existing Place object
+ WHEN: A Library is created with that Place as the contents of the list passed to the
+ Library constructor's eligibility_areas parameter
+ THEN: That Place should be the sole entry in the list returned by .service_areas
+ """
+ a_place = create_test_place(db_session)
+ a_library = create_test_library(db_session, eligibility_areas=[a_place])
+ [service_area] = a_library.service_areas
+ assert service_area.place == a_place
+ assert service_area.library == a_library
+
+ db_session.delete(a_library)
+ db_session.delete(a_place)
+ db_session.commit()
+
+ @pytest.mark.skip(reason="Merged in from develop, needs edits")
+ def test_types(self, db_session, create_test_place, create_test_library, zip_10018, new_york_city, new_york_state):
+ """
+ GIVEN:
+ WHEN:
+ THEN:
+ """
+ postal = zip_10018
+ city = new_york_city
+ state = new_york_state
+ nation = create_test_place(db_session, external_id='CA', external_name='Canada',
+ place_type=Place.NATION, abbreviated_name='CA')
+ province = create_test_place(db_session, external_id="MB", external_name="Manitoba",
+ place_type=Place.STATE, abbreviated_name="MB", parent=nation)
+ everywhere = Place.everywhere(db_session)
+
+ # Libraries with different kinds of service areas are given different types.
+ for focus, type in (
+ (postal, LibraryType.LOCAL),
+ (city, LibraryType.LOCAL),
+ (state, LibraryType.STATE),
+ (province, LibraryType.PROVINCE),
+ (nation, LibraryType.NATIONAL),
+ (everywhere, LibraryType.UNIVERSAL)
+ ):
+ library = create_test_library(db_session, focus_areas=[focus])
+ assert focus.library_type == type
+ assert [type] == list(library.types)
+ db_session.delete(library)
+ db_session.commit()
+
+ # If a library's service area is ambiguous, it has no service area-related type.
+ library = create_test_library(db_session, library_name="library", focus_areas=[postal, province])
+ assert [] == list(library.types)
+ db_session.delete(library)
+ db_session.delete(nation)
+ db_session.delete(province)
+ db_session.commit()
+
+ @pytest.mark.parametrize(
+ "location,liborder",
+ [
+ pytest.param((39.733073, -97.856284), ["ALPHA", "BRAVO", "CHARLIE"], id="P1"),
+ pytest.param((39.014456, -97.028744), ["ALPHA", "CHARLIE", "BRAVO"], id="P2"),
+ pytest.param((38.581711, -96.801934), ["CHARLIE", "ALPHA", "BRAVO"], id="P3"),
+ pytest.param((37.798725, -98.024885), ["CHARLIE", "BRAVO", "ALPHA"], id="P4"),
+ pytest.param((38.577897, -99.070922), ["BRAVO", "CHARLIE", "ALPHA"], id="P5"),
+ pytest.param((39.085152, -99.012190), ["BRAVO", "ALPHA", "CHARLIE"], id="P6"),
+ ]
+ )
+ def test_nearby_all(self, db_session, nearby_libs, capsys, location, liborder):
+ """
+ GIVEN: A known set of three Libraries and a known set of six locations
+ WHEN: Library.nearby() is called for a location, with 1000km radius
+ THEN: The returned set of three Libraries should be in the correct distance order
+ """
+ found_libs = Library.nearby(db_session, Location(location), max_radius=1000).all()
+ assert len(found_libs) == 3
+ assert [x[0].name for x in found_libs] == liborder
+
+ @pytest.mark.parametrize(
+ "location,liborder",
+ [
+ pytest.param((39.733073, -97.856284), ["ALPHA", "BRAVO"], id="P1_150km"),
+ pytest.param((39.014456, -97.028744), ["ALPHA", "CHARLIE"], id="P2_150km"),
+ pytest.param((38.581711, -96.801934), ["CHARLIE", "ALPHA"], id="P3_150km"),
+ pytest.param((37.798725, -98.024885), ["CHARLIE", "BRAVO"], id="P4_150km"),
+ pytest.param((38.577897, -99.070922), ["BRAVO", "CHARLIE", "ALPHA"], id="P5_150km"),
+ pytest.param((39.085152, -99.012190), ["BRAVO", "ALPHA", "CHARLIE"], id="P6_150km"),
+ ]
+ )
+ def test_nearby_150km(self, db_session, nearby_libs, capsys, location, liborder):
+ """
+ GIVEN: A known set of three Libraries and a known set of six locations
+ WHEN: Library.nearby() is called for a location, with 150km radius
+ THEN: The returned set of Libraries should be limited to those in range
+ """
+ found_libs = Library.nearby(db_session, Location(location), max_radius=150).all()
+ assert [x[0].name for x in found_libs] == liborder
+
+ @pytest.mark.parametrize(
+ "location,liborder",
+ [
+ pytest.param((39.733073, -97.856284), ["ECHO", "DELTA", "FOXTROT"], id="P1"),
+ pytest.param((39.014456, -97.028744), ["ECHO", "DELTA", "FOXTROT"], id="P2"),
+ pytest.param((38.581711, -96.801934), ["ECHO", "DELTA", "FOXTROT"], id="P3"),
+ pytest.param((37.798725, -98.024885), ["ECHO", "DELTA", "FOXTROT"], id="P4"),
+ pytest.param((38.577897, -99.070922), ["DELTA", "ECHO", "FOXTROT"], id="P5"),
+ pytest.param((39.085152, -99.012190), ["DELTA", "ECHO", "FOXTROT"], id="P6"),
+ pytest.param((38.645276, -101.857932), ["DELTA", "FOXTROT", "ECHO"], id="P7_western_KS"),
+ ]
+ )
+ def test_nearest_supralocal(self, db_session, nearby_libs, state_libs, location, liborder):
+ """
+ GIVEN: A known set of
+ WHEN:
+ THEN:
+ """
+ found_supra_libs = Library.nearest_supralocals(db_session, Location(location), max_radius=1000).all()
+ assert [x[0].name for x in found_supra_libs] == liborder
diff --git a/tests/models/test_place.py b/tests/models/test_place.py
new file mode 100644
index 00000000..b27f7910
--- /dev/null
+++ b/tests/models/test_place.py
@@ -0,0 +1,360 @@
+import json
+import os
+from pathlib import Path
+
+import pytest
+from sqlalchemy import func
+from sqlalchemy.orm.exc import MultipleResultsFound
+
+from config import Configuration
+from model import ConfigurationSetting, Place
+from util.geo import Location
+
+
+class TestPlace:
+ """
+ Tests the Place and PlaceAlias models.
+
+ Note that these tests rely heavily on the 'places' fixture from tests/conftest.py.
+ """
+ def test_relation_parent(self, places):
+ """
+ GIVEN: A Place object defined with another Place as its 'parent'
+ WHEN: The 'parent' attribute is examined
+ THEN: That attribute should contain a reference to the parent
+ """
+ assert places["new_york_city"].parent == places["new_york_state"]
+ assert places["zip_10018"].parent == places["new_york_state"]
+ assert places["boston_ma"].parent == places["massachusetts_state"]
+ assert places["manhattan_ks"].parent == places["kansas_state"]
+
+ def test_relation_children(self, places):
+ """
+ GIVEN: A Place object defined with another Place as its 'parent'
+ WHEN: The 'children' attribute of the parent object is examined
+ THEN: That attribute should contain a reference to the child object
+ """
+ assert places["zip_10018"] in places["new_york_state"].children
+ assert places["new_york_city"] in places["new_york_state"].children
+ assert places["boston_ma"] in places["massachusetts_state"].children
+ assert places["manhattan_ks"] in places["kansas_state"].children
+
+ def test_relation_alias(self, places):
+ """
+ GIVEN: A Place object which was referenced in the creation of a PlaceAlias object
+ WHEN: The 'aliases' attribute of that Place object is examined
+ THEN: That attribute should contain a reference to the PlaceAlias object
+ """
+ nyc_aliases = places["new_york_city"].aliases
+ assert "Manhattan" in [x.name for x in nyc_aliases]
+ assert "Brooklyn" in [x.name for x in nyc_aliases]
+ assert "New York" in [x.name for x in nyc_aliases]
+
+ def test_default_nation_unset(self, db_session, app):
+ """
+ GIVEN: The sitewide setting Configuration.DEFAULT_NATION_ABBREVIATION is unset
+ WHEN: Place.default_nation() is called on the test db
+ THEN: The Place.default_nation() method should return None
+ """
+ setting = ConfigurationSetting.sitewide(db_session, Configuration.DEFAULT_NATION_ABBREVIATION)
+ assert setting.value is None
+ assert Place.default_nation(db_session) is None
+
+ def test_default_nation_set(self, db_session, places, app):
+ """
+ GIVEN: The sitewide setting Configuration.DEFAULT_NATION_ABBREVIATION is explicitly set
+ WHEN: Place.default_nation() is called on the test db
+ THEN: The Place.default_nation() method should return the set value
+ """
+ setting = ConfigurationSetting.sitewide(db_session, Configuration.DEFAULT_NATION_ABBREVIATION)
+ setting.value = places["crude_us"].abbreviated_name
+ default_nation_place = Place.default_nation(db_session)
+ assert isinstance(default_nation_place, Place)
+ assert default_nation_place.abbreviated_name == places["crude_us"].abbreviated_name
+
+ def test_distances_from_point(self, db_session, places, capsys):
+ """
+ GIVEN: A place representing a point
+ WHEN: A spatial query of US states is ordered by distance from that point
+ THEN: Returned state places should be ordered by their distance from that point
+ """
+ distance = func.ST_DistanceSphere(places["lake_placid_ny"].geometry, Place.geometry)
+ states = db_session.query(Place).filter(Place.type == Place.STATE).order_by(
+ distance).add_columns(distance).limit(4)
+
+ # Note that we've limited it to 4 states, because MA has no geometry in the
+ # places fixture, so it produces non-deterministic distances.
+ expected = [('NY', 0), ('CT', 235), ('KS', 1818), ('NM', 2592)]
+ actual = [(state.abbreviated_name, int(dist/1000)) for (state, dist) in list(states)]
+ assert actual == expected
+
+ def test_to_geojson(self, db_session, places):
+ """
+ GIVEN: Places that have been loaded from geojson
+ WHEN: They are passed as arguments to Place.to_geojson()
+ THEN: Their original geojson representation should be returned
+ """
+ TEST_DATA_DIR = Path(os.path.dirname(__file__)).parent / "data"
+ zip_10018_geojson = (TEST_DATA_DIR / 'zip_10018_geojson.json').read_text()
+ zip_11212_geojson = (TEST_DATA_DIR / 'zip_11212_geojson.json').read_text()
+
+ # If you ask for the GeoJSON of one place, that place is returned as-is.
+ geojson_single = Place.to_geojson(db_session, places["zip_10018"])
+ assert geojson_single == json.loads(zip_10018_geojson)
+
+ # If you ask for GeoJSON of several places, it's returned as a GeometryCollection document.
+ geojson_multi = Place.to_geojson(db_session, places["zip_10018"], places["zip_11212"])
+ assert geojson_multi['type'] == "GeometryCollection"
+
+ # There are two geometries in this document -- one for each Place we passed in.
+ assert len(geojson_multi['geometries']) == 2
+
+ for geojson in [zip_10018_geojson, zip_11212_geojson]:
+ assert json.loads(geojson) in geojson_multi['geometries']
+
+ @pytest.mark.parametrize(
+ "place_name,centroid_string",
+ [
+ pytest.param("new_york_state", "POINT(-75.503116 42.940380)", id="new_york_state"),
+ pytest.param("connecticut_state", "POINT(-72.725708 41.620274)", id="connecticut_state"),
+ pytest.param("kansas_state", "POINT(-98.3802053 38.484701)", id="kansas_state"),
+ pytest.param("new_mexico_state", "POINT(-106.107840 34.421558)", id="new_mexico_state"),
+ pytest.param("new_york_city", "POINT(-73.924869 40.694272)", id="new_york_city"),
+ pytest.param("crude_kings_county", "POINT(-73.941020 40.640365)", id="crude_kings_county"),
+ pytest.param("lake_placid_ny", "POINT(-73.59 44.17)", id="lake_placid_ny"),
+ pytest.param("crude_new_york_county", "POINT(-73.968863 40.779112)", id="crude_new_york_county"),
+ pytest.param("zip_10018", "POINT(-73.993192 40.755335)", id="zip_10018"),
+ pytest.param("zip_11212", "POINT(-73.913026 40.662926)", id="zip_11212"),
+ pytest.param("zip_12601", "POINT(-73.911652 41.703563)", id="zip_12601"),
+ pytest.param("crude_albany", "POINT(-73.805886 42.675764)", id="crude_albany"),
+ pytest.param("boston_ma", "POINT(-71.083837 42.318914)", id="boston_ma"),
+ pytest.param("manhattan_ks", "POINT(-96.605011 39.188330)", id="manhattan_ks"),
+ ]
+ )
+ def test_as_centroid_point(self, places, place_name, centroid_string):
+ """
+ GIVEN: A Place object with a defined geometry
+ WHEN: .as_centroid_point() is called on that Place instance
+ THEN: An EWKT Point string matching the centroid of that geometry should be returned
+ """
+ assert Location(places[place_name].as_centroid_point()) == Location(centroid_string)
+
+ @pytest.mark.skip(reason="Needs investigating")
+ def test_overlaps_not_counting_border(self, db_session, places):
+ """
+ Test that overlaps_not_counting_border does not count places that share a border as
+ intersecting, the way the PostGIS 'intersect' logic does.
+ """
+
+ def s_i(place1, place2):
+ """
+ Use overlaps_not_counting_border to provide a boolean answer
+ to the question: does place 2 strictly intersect place 1?
+ """
+ qu = db_session.query(Place)
+ qu = place1.overlaps_not_counting_border(qu)
+ return place2 in qu.all()
+
+ # Places that contain each other intersect.
+ assert s_i(places["new_york_city"], places["new_york_state"]) is True
+ assert s_i(places["new_york_state"], places["new_york_city"]) is True
+
+ # Places that don't share a border don't intersect.
+ assert s_i(places["new_york_city"], places["connecticut_state"]) is False
+ assert s_i(places["connecticut_state"], places["new_york_city"]) is False
+
+ # Connecticut and New York share a border, so PostGIS says they
+ # intersect, but they don't "intersect" in the everyday sense,
+ # so overlaps_not_counting_border excludes them.
+ assert s_i(places["new_york_state"], places["connecticut_state"]) is False
+ assert s_i(places["connecticut_state"], places["new_york_state"]) is False
+
+ def test_parse_name(self):
+ assert Place.parse_name("Kern County") == ("Kern", Place.COUNTY)
+ assert Place.parse_name("New York State") == ("New York", Place.STATE)
+ assert Place.parse_name("Chicago, IL") == ("Chicago, IL", None)
+
+ def test_name_parts(self):
+ assert Place.name_parts("Boston, MA") == ["MA", "Boston"]
+ assert Place.name_parts("Boston, MA,") == ["MA", "Boston"]
+ assert Place.name_parts("Anytown, USA") == ["USA", "Anytown"]
+ assert Place.name_parts("Lake County, Ohio, US") == ["US", "Ohio", "Lake County"]
+
+ def test_lookup_by_name(self, db_session, create_test_place):
+ santa_barbara_city = create_test_place(db_session, external_name="Santa Barbara", place_type=Place.CITY)
+ santa_barbara_county = create_test_place(db_session, external_name="Santa Barbara", place_type=Place.COUNTY)
+
+ # Look up by name returns the city
+ assert Place.lookup_by_name(db_session, "Santa Barbara").all() == [santa_barbara_city]
+
+ # To find the county, must include 'County' in the name
+ assert Place.lookup_by_name(db_session, "Santa Barbara County").all() == [santa_barbara_county]
+
+ @pytest.mark.skip(reason="Needs investigating")
+ def test_lookup_inside(self, db_session, places, create_test_place):
+ us = places["crude_us"]
+ zip_10018 = places["zip_10018"]
+ nyc = places["new_york_city"]
+ new_york = places["new_york_state"]
+ connecticut = places["connecticut_state"]
+ manhattan_ks = places["manhattan_ks"]
+ kings_county = places["crude_kings_county"]
+ zip_12601 = places["zip_12601"]
+
+ # In most cases, we want to test that both versions of
+ # lookup_inside() return the same result.
+ def lookup_both_ways(parent, name, expect):
+ assert parent.lookup_inside(name, using_overlap=True) == expect
+ assert parent.lookup_inside(name, using_overlap=False) == expect
+
+ everywhere = Place.everywhere(db_session)
+ lookup_both_ways(everywhere, "US", us)
+ lookup_both_ways(everywhere, "NY", new_york)
+ lookup_both_ways(us, "NY", new_york)
+
+ lookup_both_ways(new_york, "10018", zip_10018)
+ lookup_both_ways(us, "10018, NY", zip_10018)
+ lookup_both_ways(us, "New York, NY", nyc)
+ lookup_both_ways(new_york, "New York", nyc)
+
+ # Test that the disambiguators "State" and "County" are handled properly.
+ lookup_both_ways(us, "New York State", new_york)
+ lookup_both_ways(us, "Kings County, NY", kings_county)
+ lookup_both_ways(us, "New York State", new_york)
+
+ lookup_both_ways(us, "Manhattan, KS", manhattan_ks)
+ lookup_both_ways(us, "Manhattan, Kansas", manhattan_ks)
+
+ lookup_both_ways(new_york, "Manhattan, KS", None)
+ lookup_both_ways(connecticut, "New York", None)
+ lookup_both_ways(new_york, "Manhattan, KS", None)
+ lookup_both_ways(connecticut, "New York", None)
+ lookup_both_ways(connecticut, "New York, NY", None)
+ lookup_both_ways(connecticut, "10018", None)
+
+ # Even though the parent of a ZIP code is a state, special
+ # code allows you to look them up within the nation.
+ lookup_both_ways(us, "10018", zip_10018)
+ lookup_both_ways(new_york, "10018", zip_10018)
+
+ # You can't find a place 'inside' itself.
+ lookup_both_ways(us, "US", None)
+ lookup_both_ways(new_york, "NY, US, 10018", None)
+
+ # Or 'inside' a place that's known to be smaller than it.
+ lookup_both_ways(kings_county, "NY", None)
+ lookup_both_ways(us, "NY, 10018", None)
+ lookup_both_ways(zip_10018, "NY", None)
+
+ # There is a limited ability to look up places even when the
+ # name of the city is not in the database -- a representative
+ # postal code is returned. This goes through
+ # lookup_one_through_external_source, which is tested in more
+ # detail below.
+ lookup_both_ways(new_york, "Poughkeepsie", zip_12601)
+
+ # Now test cases where using_overlap makes a difference.
+ #
+ # First, the cases where using_overlap=True performs better.
+ #
+
+ # Looking up the name of a county by itself only works with
+ # using_overlap=True, because the .parent of a county is its
+ # state, not the US.
+ #
+ # Many county names are ambiguous, but this lets us parse
+ # the ones that are not.
+ assert everywhere.lookup_inside("Kings County, US", using_overlap=True) == kings_county
+
+ # Neither of these is obviously better.
+ assert us.lookup_inside("Manhattan") is None
+ with pytest.raises(MultipleResultsFound) as exc:
+ us.lookup_inside("Manhattan", using_overlap=True)
+ assert "More than one place called Manhattan inside United States." in str(exc.value)
+
+ # Now the cases where using_overlap=False performs better.
+
+ # "New York, US" is a little ambiguous, but they probably mean
+ # the state.
+ assert us.lookup_inside("New York") == new_york
+ with pytest.raises(MultipleResultsFound) as exc:
+ us.lookup_inside("New York", using_overlap=True)
+ assert "More than one place called New York inside United States." in str(exc.value)
+
+ # "New York, New York" can only be parsed by parentage.
+ assert us.lookup_inside("New York, New York") == nyc
+ with pytest.raises(MultipleResultsFound) as exc:
+ us.lookup_inside("New York, New York", using_overlap=True)
+ assert "More than one place called New York inside United States." in str(exc.value)
+
+ # Using geographic overlap has another problem -- although the
+ # name of the method is 'lookup_inside', we're actually
+ # checking for _intersection_. Places that overlap are treated
+ # as being inside *each other*.
+ assert zip_10018.lookup_inside("New York", using_overlap=True) == nyc
+ assert zip_10018.lookup_inside("New York", using_overlap=False) is None
+
+ @pytest.mark.skip(reason="docker problem for uszipcode")
+ def test_lookup_one_through_external_source(self, places, db_session, create_test_place):
+ # We're going to find the approximate location of Poughkeepsie
+ # even though the database doesn't have a Place named "Poughkeepsie".
+ #
+ # We're able to do this because uszipcode knows which ZIP codes are in
+ # Poughkeepsie, and we do have a Place for one of those ZIP codes.
+ zip_12601 = places["zip_12601"]
+ new_york = places["new_york_state"]
+ connecticut = places["connecticut_state"]
+
+ m = new_york.lookup_one_through_external_source
+ poughkeepsie_zips = m("Poughkeepsie")
+
+ # There are three ZIP codes in Poughkeepsie, and uszipcode
+ # knows about all of them, but the only Place returned by
+ # lookup_through_external_source is the one for the ZIP code
+ # we know about.
+ assert poughkeepsie_zips == zip_12601
+
+ # If we ask about a real place but there is no corresponding
+ # postal code Place in the database, we get nothing.
+ assert m("Woodstock") is None
+
+ # Similarly if we ask about a nonexistent place.
+ assert m("ZXCVB") is None
+
+ # Or if we try to use uszipcode on a place that's not in the US.
+ ontario = create_test_place(db_session, external_id='35', external_name='Ontario',
+ place_type=Place.STATE, abbreviated_name='ON', parent=None, geometry=None)
+ assert ontario.lookup_one_through_external_source('Hamilton') is None
+
+ # Calling this method on a Place that's not a state doesn't
+ # make sense (because uszipcode only knows about cities within
+ # states), and the result is always None.
+ assert zip_12601.lookup_one_through_external_source("Poughkeepsie") is None
+
+ # lookup_one_through_external_source operates on the same
+ # rules as lookup_inside -- the city you're looking up must be
+ # geographically inside the Place whose method you're calling.
+ assert connecticut.lookup_one_through_external_source("Poughkeepsie") is None
+
+ def test_served_by(self, places, libraries):
+ zip = places["zip_10018"]
+ nyc = places["new_york_city"]
+ new_york = places["new_york_state"]
+ connecticut = places["connecticut_state"]
+
+ # There are two libraries here...
+ nypl = libraries["nypl"]
+ ct_state = libraries["connecticut_state_library"]
+
+ # ...but only one serves the 10018 ZIP code.
+ assert zip.served_by().all() == [nypl]
+
+ assert nyc.served_by().all() == [nypl]
+ assert connecticut.served_by().all() == [ct_state]
+
+ # New York and Connecticut share a border, and the Connecticut
+ # state library serves the entire state, including the
+ # border. Internally, we use overlaps_not_counting_border() to avoid
+ # concluding that the Connecticut state library serves New
+ # York.
+ assert new_york.served_by().all() == [nypl]
diff --git a/tests/test_adobe_vendor_id.py b/tests/test_adobe_vendor_id.py
index 3a300dfb..6b5e6e1f 100644
--- a/tests/test_adobe_vendor_id.py
+++ b/tests/test_adobe_vendor_id.py
@@ -1,36 +1,67 @@
-import datetime
import json
-from config import (
- CannotLoadConfiguration,
- Configuration,
- temp_config,
-)
+import adobe_xml_templates as t
from adobe_vendor_id import (
AdobeSignInRequestParser,
AdobeAccountInfoRequestParser,
+ AdobeVendorIDClient,
AdobeVendorIDRequestHandler,
AdobeVendorIDModel,
- MockAdobeVendorIDClient,
VendorIDAuthenticationError,
VendorIDServerException,
)
-
-from model import(
+from config import Configuration
+from model import (
DelegatedPatronIdentifier,
ExternalIntegration,
create,
)
-
from util.short_client_token import ShortClientTokenEncoder
from util.string_helpers import base64
-from . import (
- DatabaseTest,
-)
+from . import DatabaseTest
-class VendorIDTest(DatabaseTest):
+class MockAdobeVendorIDClient(AdobeVendorIDClient):
+ """Mock AdobeVendorIDClient for use in tests."""
+
+ def __init__(self):
+ self.queue = []
+
+ def enqueue(self, response):
+ """Queue a response."""
+ self.queue.insert(0, response)
+
+ def dequeue(self, *args, **kwargs):
+ """Dequeue a response. If it's an exception, raise it. Otherwise return it."""
+ if not self.queue:
+ raise VendorIDServerException("No response queued.")
+
+ response = self.queue.pop()
+
+ if isinstance(response, Exception):
+ raise response
+
+ return response
+
+ status = dequeue
+ sign_in_authdata = dequeue
+ sign_in_standard = dequeue
+ user_info = dequeue
+
+
+class TestAdobeVendorIdController:
+ def test_signin_handler(self):
+ ...
+
+ def test_userinfo_handler(self):
+ ...
+
+ def test_status_handler(self):
+ ...
+
+
+class VendorIDTest(DatabaseTest):
NODE_VALUE = "0x685b35c00f05"
def _integration(self):
@@ -45,6 +76,7 @@ def _integration(self):
integration.setting(Configuration.ADOBE_VENDOR_ID_NODE_VALUE).value = self.NODE_VALUE
return integration
+
class TestConfiguration(VendorIDTest):
def test_accessor(self):
@@ -70,19 +102,13 @@ def test_accessor_with_delegates(self):
class TestVendorIDRequestParsers(object):
-
- username_sign_in_request = """
-Vendor username
-Vendor password
-"""
-
- authdata_sign_in_request = """
- dGhpcyBkYXRhIHdhcyBiYXNlNjQgZW5jb2RlZA==
-"""
-
- accountinfo_request = """
-urn:uuid:0xxxxxxx-xxxx-1xxx-xxxx-yyyyyyyyyyyy
-"""
+ username_sign_in_request = t.SIGN_IN_REQUEST_TEMPLATE % {
+ "username": "Vendor username", "password": "Vendor password"
+ }
+ authdata_sign_in_request = t.AUTHDATA_SIGN_IN_REQUEST_TEMPLATE % {
+ "authdata": "dGhpcyBkYXRhIHdhcyBiYXNlNjQgZW5jb2RlZA=="
+ }
+ accountinfo_request = t.ACCOUNT_INFO_REQUEST_TEMPLATE % {"uuid": "urn:uuid:0xxxxxxx-xxxx-1xxx-xxxx-yyyyyyyyyyyy"}
def test_username_sign_in_request(self):
parser = AdobeSignInRequestParser()
@@ -93,46 +119,29 @@ def test_authdata_sign_in_request(self):
parser = AdobeSignInRequestParser()
data = parser.process(self.authdata_sign_in_request)
assert data == {'authData': 'this data was base64 encoded', 'method': 'authData'}
-
def test_accountinfo_request(self):
parser = AdobeAccountInfoRequestParser()
data = parser.process(self.accountinfo_request)
assert data == {'method': 'standard', 'user': 'urn:uuid:0xxxxxxx-xxxx-1xxx-xxxx-yyyyyyyyyyyy'}
-class TestVendorIDRequestHandler(object):
- username_sign_in_request = """
-%(username)s
-%(password)s
-"""
-
- authdata_sign_in_request = """
-%(authdata)s
-"""
-
- accountinfo_request = """
-%(uuid)s
-"""
+class TestVendorIDRequestHandler:
+ username_sign_in_request = t.SIGN_IN_REQUEST_TEMPLATE
+ accountinfo_request = t.ACCOUNT_INFO_REQUEST_TEMPLATE
TEST_VENDOR_ID = "1045"
user1_uuid = "test-uuid"
user1_label = "Human-readable label for user1"
- username_password_lookup = {
- ("user1", "pass1") : (user1_uuid, user1_label)
- }
-
- authdata_lookup = {
- "The secret token" : (user1_uuid, user1_label)
- }
-
- userinfo_lookup = { user1_uuid : user1_label }
+ user1_signin_xml_response_body = t.SIGN_IN_RESPONSE_TEMPLATE % {"user": user1_uuid, "label": user1_label}
+ username_password_lookup = {("user1", "pass1"): (user1_uuid, user1_label)}
+ authdata_lookup = {"The secret token": (user1_uuid, user1_label)}
+ userinfo_lookup = {user1_uuid: user1_label}
@property
def _handler(self):
- return AdobeVendorIDRequestHandler(
- self.TEST_VENDOR_ID)
+ return AdobeVendorIDRequestHandler(self.TEST_VENDOR_ID)
@classmethod
def _standard_login(cls, data):
@@ -148,76 +157,95 @@ def _userinfo(cls, uuid):
return cls.userinfo_lookup.get(uuid)
def test_error_document(self):
- doc = self._handler.error_document(
- "VENDORID", "Some random error")
+ doc = self._handler.error_document("VENDORID", "Some random error")
assert doc == ''
def test_handle_username_sign_in_request_success(self):
- doc = self.username_sign_in_request % dict(
- username="user1", password="pass1")
+ signin_request_xml_body = t.SIGN_IN_REQUEST_TEMPLATE % {"username": "user1", "password": "pass1"}
result = self._handler.handle_signin_request(
- doc, self._standard_login, self._authdata_login)
- assert result.startswith('\ntest-uuid\n\n')
+ signin_request_xml_body,
+ self._standard_login,
+ self._authdata_login
+ )
+ assert result.startswith(self.user1_signin_xml_response_body)
def test_handle_username_sign_in_request_failure(self):
- doc = self.username_sign_in_request % dict(
- username="user1", password="wrongpass")
+ signin_request_xml_body = t.SIGN_IN_REQUEST_TEMPLATE % {"username": self.user1_uuid, "password": "wrongpass"}
result = self._handler.handle_signin_request(
- doc, self._standard_login, self._authdata_login)
- assert result == ''
+ signin_request_xml_body,
+ self._standard_login,
+ self._authdata_login
+ )
+ expected = t.ERROR_RESPONSE_TEMPLATE % {
+ "vendor_id": "1045",
+ "type": "AUTH",
+ "message": "Incorrect barcode or PIN.",
+ }
+ assert result == expected
def test_handle_username_authdata_request_success(self):
- doc = self.authdata_sign_in_request % dict(
- authdata=base64.b64encode("The secret token"))
+ secret_token = base64.b64encode("The secret token")
+ authdata_request_xml_body = t.AUTHDATA_SIGN_IN_REQUEST_TEMPLATE % {"authdata": secret_token}
result = self._handler.handle_signin_request(
- doc, self._standard_login, self._authdata_login)
- assert result.startswith('\ntest-uuid\n\n')
+ authdata_request_xml_body,
+ self._standard_login,
+ self._authdata_login
+ )
+ assert result.startswith(self.user1_signin_xml_response_body)
def test_handle_username_authdata_request_invalid(self):
- doc = self.authdata_sign_in_request % dict(
- authdata="incorrect")
- result = self._handler.handle_signin_request(
- doc, self._standard_login, self._authdata_login)
+ doc = t.AUTHDATA_SIGN_IN_REQUEST_TEMPLATE % dict(authdata="incorrect")
+ result = self._handler.handle_signin_request(doc, self._standard_login, self._authdata_login)
assert result.startswith(''
+ doc = t.AUTHDATA_SIGN_IN_REQUEST_TEMPLATE % dict(authdata=base64.b64encode("incorrect"))
+ result = self._handler.handle_signin_request(doc, self._standard_login, self._authdata_login)
+ expected = t.ERROR_RESPONSE_TEMPLATE % {
+ "vendor_id": "1045",
+ "type": "AUTH",
+ "message": "Incorrect token.",
+ }
+ assert result == expected
def test_failure_send_login_request_to_accountinfo(self):
- doc = self.authdata_sign_in_request % dict(
- authdata=base64.b64encode("incorrect"))
- result = self._handler.handle_accountinfo_request(
- doc, self._userinfo)
- assert result == ''
+ doc = t.AUTHDATA_SIGN_IN_REQUEST_TEMPLATE % dict(authdata=base64.b64encode("incorrect"))
+ result = self._handler.handle_accountinfo_request(doc, self._userinfo)
+ expected = t.ERROR_RESPONSE_TEMPLATE % {
+ "vendor_id": "1045",
+ "type": "ACCOUNT_INFO",
+ "message": "Request document in wrong format.",
+ }
+ assert result == expected
def test_failure_send_accountinfo_request_to_login(self):
- doc = self.accountinfo_request % dict(
- uuid=self.user1_uuid)
- result = self._handler.handle_signin_request(
- doc, self._standard_login, self._authdata_login)
- assert result == ''
+ doc = self.accountinfo_request % dict(uuid=self.user1_uuid)
+ result = self._handler.handle_signin_request(doc, self._standard_login, self._authdata_login)
+ expected = t.ERROR_RESPONSE_TEMPLATE % {
+ "vendor_id": "1045",
+ "type": "AUTH",
+ "message": "Request document in wrong format.",
+ }
+ assert result == expected
def test_handle_accountinfo_success(self):
- doc = self.accountinfo_request % dict(
- uuid=self.user1_uuid)
- result = self._handler.handle_accountinfo_request(
- doc, self._userinfo)
- assert result == '\n\n'
+ doc = self.accountinfo_request % dict(uuid=self.user1_uuid)
+ result = self._handler.handle_accountinfo_request(doc, self._userinfo)
+ expected = t.ACCOUNT_INFO_RESPONSE_TEMPLATE % {"label": self.user1_label}
+ assert result == expected
def test_handle_accountinfo_failure(self):
- doc = self.accountinfo_request % dict(
- uuid="not the uuid")
- result = self._handler.handle_accountinfo_request(
- doc, self._userinfo)
- assert result == ''
+ doc = self.accountinfo_request % dict(uuid="not the uuid")
+ result = self._handler.handle_accountinfo_request(doc, self._userinfo)
+ expected = t.ERROR_RESPONSE_TEMPLATE % {
+ "vendor_id": "1045",
+ "type": "ACCOUNT_INFO",
+ "message": "Could not identify patron from 'not the uuid'.",
+ }
+ assert result == expected
class TestVendorIDModel(VendorIDTest):
-
def setup(self):
super(TestVendorIDModel, self).setup()
self._integration()
@@ -286,11 +314,8 @@ def test_short_client_token_lookup_failure(self):
)
assert self.model.authdata_lookup(bad_signature) == (None, None)
-
def test_delegation_standard_lookup(self):
- """A model that doesn't know how to handle a login request can
- delegate to another Vendor ID server.
- """
+ """A model that doesn't know how to handle a login request can delegate to another Vendor ID server."""
delegate1 = MockAdobeVendorIDClient()
delegate2 = MockAdobeVendorIDClient()
diff --git a/tests/test_app.py b/tests/test_app.py
index da6b0368..aeda7ddd 100644
--- a/tests/test_app.py
+++ b/tests/test_app.py
@@ -1,26 +1,22 @@
-from io import BytesIO
-import contextlib
-import flask
import gzip
-from app_helpers import (
- compressible,
- has_library_factory,
- uses_location_factory,
-)
-from problem_details import (
- LIBRARY_NOT_FOUND
-)
+from io import BytesIO
+
+import pytest
+from flask import request, Response
+
+from app_helpers import (compressible, has_library_factory, uses_location_factory)
+from problem_details import LIBRARY_NOT_FOUND
from .test_controller import ControllerTest
-from testing import DatabaseTest
-class TestAppHelpers(ControllerTest):
+class TestAppHelpers(ControllerTest):
+ @pytest.mark.skip
def test_has_library(self):
has_library = has_library_factory(self.app)
@has_library
def route_function():
- return "Called with library %s" % flask.request.library.name
+ return f"Called with library {request.library.name}"
def assert_not_found(uuid):
response = route_function(uuid)
@@ -39,6 +35,7 @@ def assert_not_found(uuid):
response = route_function(uuid=urn)
assert response == "Called with library NYPL"
+ @pytest.mark.skip
def test_uses_location(self):
uses_location = uses_location_factory(self.app)
@@ -52,6 +49,7 @@ def route_function(_location):
with self.app.test_request_context("/?_location=-10,10"):
assert route_function() == "Called with location SRID=4326;POINT(10.0 -10.0)"
+ @pytest.mark.skip
def test_compressible(self):
# Prepare a value and a gzipped version of the value.
value = b"Compress me! (Or not.)"
@@ -83,7 +81,7 @@ def ask_for_compression(compression, header='Accept-Encoding'):
if compression:
headers[header] = compression
with self.app.test_request_context(headers=headers):
- response = flask.Response(function())
+ response = Response(function())
self.app.process_response(response)
return response
diff --git a/tests/test_authentication_document.py b/tests/test_authentication_document.py
index b85b5d85..bdfb8339 100644
--- a/tests/test_authentication_document.py
+++ b/tests/test_authentication_document.py
@@ -1,105 +1,89 @@
from collections import defaultdict
-import json
-from sqlalchemy.orm.exc import (
- MultipleResultsFound,
- NoResultFound,
-)
from authentication_document import AuthenticationDocument
-from . import DatabaseTest
-from model import (
- Audience,
- Place,
- ServiceArea,
-)
-from util.problem_detail import ProblemDetail
+from model import Audience, Place, ServiceArea
from problem_details import INVALID_INTEGRATION_DOCUMENT
-from testing import MockPlace
+from util.problem_detail import ProblemDetail
+
+from .mocks import MockPlace
# Alias for a long class name
AuthDoc = AuthenticationDocument
-class TestParseCoverage(DatabaseTest):
+class TestParseCoverage:
EVERYWHERE = AuthenticationDocument.COVERAGE_EVERYWHERE
- def parse_places(self, coverage_object, expected_places=None,
+ def parse_places(self, db_session_obj, coverage_object, expected_places=None,
expected_unknown=None, expected_ambiguous=None):
- """Call AuthenticationDocument.parse_coverage. Verify that the parsed
- list of places, as well as the dictionaries of unknown and
- ambiguous place names, are as expected.
"""
- place_objs, unknown, ambiguous = AuthDoc.parse_coverage(
- self._db, coverage_object, MockPlace
- )
+ Call AuthenticationDocument.parse_coverage. Verify that the parsed list of places, as well
+ as the dictionaries of unknown and ambiguous place names, are as expected.
+ """
+ (place_objs, unknown, ambiguous) = AuthDoc.parse_coverage(db_session_obj, coverage_object, MockPlace)
empty = defaultdict(list)
expected_places = expected_places or []
expected_unknown = expected_unknown or empty
expected_ambiguous = expected_ambiguous or empty
- # TODO PYTHON3 replace eq_sorted() with eq_()
- def eq_sorted(a, b):
- def key(x):
- return id(x)
- assert sorted(a, key=key) == sorted(b, key=key)
- eq_sorted(expected_places, place_objs)
- eq_sorted(expected_unknown, unknown)
- eq_sorted(expected_ambiguous, ambiguous)
-
- def test_universal_coverage(self):
- # Test an authentication document that says a library covers the
- # whole universe.
- self.parse_places(
- self.EVERYWHERE, [MockPlace.EVERYWHERE]
- )
- def test_entire_country(self):
- # Test an authentication document that says a library covers an
- # entire country.
+ assert set(expected_places) == set(place_objs)
+ assert set(expected_unknown) == set(unknown)
+ assert set(expected_ambiguous) == set(ambiguous)
+
+ def test_universal_coverage(self, db_session):
+ """Test an authentication document that says a library covers the whole universe"""
+ self.parse_places(db_session, self.EVERYWHERE, [MockPlace.EVERYWHERE])
+
+ def test_entire_country(self, db_session):
+ """Test an authentication document that says a library covers an entire country"""
us = MockPlace()
MockPlace.by_name["US"] = us
- self.parse_places(
- {"US": self.EVERYWHERE },
- expected_places=[us]
- )
-
- def test_ambiguous_country(self):
- # Test the unlikely scenario where an authentication document says a
- # library covers an entire country, but it's ambiguous which
- # country is being referred to.
+ self.parse_places(db_session, {"US": self.EVERYWHERE}, expected_places=[us])
+ def test_ambiguous_country(self, db_session):
+ """
+ Test the unlikely scenario where an authentication document says a library covers an
+ entire country, but it's ambiguous which country is being referred to.
+ """
canada = MockPlace()
MockPlace.by_name["CA"] = canada
MockPlace.by_name["Europe I think?"] = MockPlace.AMBIGUOUS
self.parse_places(
- {"Europe I think?": self.EVERYWHERE, "CA": self.EVERYWHERE },
+ db_session,
+ {"Europe I think?": self.EVERYWHERE, "CA": self.EVERYWHERE},
expected_places=[canada],
expected_ambiguous={"Europe I think?": self.EVERYWHERE}
)
- def test_unknown_country(self):
- # Test an authentication document that says a library covers an
- # entire country, but the library registry doesn't know anything about
- # that country's geography.
+ def test_unknown_country(self, db_session):
+ """
+ Test an authentication document that says a library covers an
+ entire country, but the library registry doesn't know anything about
+ that country's geography.
+ """
canada = MockPlace()
MockPlace.by_name["CA"] = canada
self.parse_places(
- {"Memory Alpha": self.EVERYWHERE, "CA": self.EVERYWHERE },
+ db_session,
+ {"Memory Alpha": self.EVERYWHERE, "CA": self.EVERYWHERE},
expected_places=[canada],
expected_unknown={"Memory Alpha": self.EVERYWHERE}
)
- def test_places_within_country(self):
- # Test an authentication document that says a library
- # covers one or more places within a country.
-
- # This authentication document covers two places called
- # "San Francisco" (one in the US and one in Mexico) as well as a
- # place called "Mexico City" in Mexico.
- #
- # Note that it's invalid to map a country name to a single
- # place name (it's supposed to always be a list), but our
- # parser can handle it.
+ def test_places_within_country(self, db_session):
+ """
+ Test an authentication document that says a library
+ covers one or more places within a country.
+
+ This authentication document covers two places called
+ "San Francisco" (one in the US and one in Mexico) as well as a
+ place called "Mexico City" in Mexico.
+
+ Note that it's invalid to map a country name to a single
+ place name (it's supposed to always be a list), but our
+ parser can handle it.
+ """
doc = {"US": "San Francisco", "MX": ["San Francisco", "Mexico City"]}
place1 = MockPlace()
@@ -111,65 +95,47 @@ def test_places_within_country(self):
MockPlace.by_name["US"] = us
MockPlace.by_name["MX"] = mx
- # AuthenticationDocument.parse_coverage is able to turn those
- # three place names into place objects.
- self.parse_places(
- doc,
- expected_places=[place1, place3, place4]
- )
+ # AuthenticationDocument.parse_coverage is able to turn those three place names into place objects.
+ self.parse_places(db_session, doc, expected_places=[place1, place3, place4])
- def test_ambiguous_place_within_country(self):
- # Test an authentication document that names an ambiguous
- # place within a country.
+ def test_ambiguous_place_within_country(self, db_session):
+ """Test an authentication document that names an ambiguous place within a country"""
us = MockPlace(inside={"Springfield": MockPlace.AMBIGUOUS})
MockPlace.by_name["US"] = us
+ self.parse_places(db_session, {"US": ["Springfield"]}, expected_ambiguous={"US": ["Springfield"]})
- self.parse_places(
- {"US": ["Springfield"]},
- expected_ambiguous={"US": ["Springfield"]}
- )
-
- def test_unknown_place_within_country(self):
- # Test an authentication document that names an unknown
- # place within a country.
+ def test_unknown_place_within_country(self, db_session):
+ """Test an authentication document that names an unknown place within a country"""
sf = MockPlace()
us = MockPlace(inside={"San Francisco": sf})
MockPlace.by_name["US"] = us
- self.parse_places(
- {"US": "Nowheresville"},
- expected_unknown={"US": ["Nowheresville"]}
- )
+ self.parse_places(db_session, {"US": "Nowheresville"}, expected_unknown={"US": ["Nowheresville"]})
- def test_unscoped_place_is_in_default_nation(self):
- # Test an authentication document that names places without
- # saying which nation they're in.
+ def test_unscoped_place_is_in_default_nation(self, db_session):
+ """Test an authentication document that names places without saying which nation they're in"""
ca = MockPlace()
ut = MockPlace()
- # Without a default nation on the server side, we can't make
- # sense of these place names.
- self.parse_places("CA", expected_unknown={"??": "CA"})
+ # Without a default nation on the server side, we can't make sense of these place names.
+ self.parse_places(db_session, "CA", expected_unknown={"??": "CA"})
- self.parse_places(
- ["CA", "UT"], expected_unknown={"??": ["CA", "UT"]}
- )
+ self.parse_places(db_session, ["CA", "UT"], expected_unknown={"??": ["CA", "UT"]})
us = MockPlace(inside={"CA": ca, "UT": ut})
us.abbreviated_name = "US"
MockPlace.by_name["US"] = us
- # With a default nation in place, a bare string like "CA"
- # is treated the same as a correctly formatted dictionary
- # like {"US": ["CA"]}
+ # With a default nation in place, a bare string like "CA" is treated the same as a
+ # correctly formatted dictionary like {"US": ["CA"]}
MockPlace._default_nation = us
- self.parse_places("CA", expected_places=[ca])
- self.parse_places(["CA", "UT"], expected_places=[ca, ut])
+ self.parse_places(db_session, "CA", expected_places=[ca])
+ self.parse_places(db_session, ["CA", "UT"], expected_places=[ca, ut])
MockPlace._default_nation = None
-class TestLinkExtractor(object):
+class TestLinkExtractor:
"""Test the _extract_link helper method."""
def test_no_matching_link(self):
@@ -182,21 +148,14 @@ def test_no_matching_link(self):
assert AuthDoc._extract_link(links, 'alternate', require_type="text/plain") is None
def test_prefer_type(self):
- """Test that prefer_type holds out for the link you're
- looking for.
- """
- first_link = dict(
- rel="alternate", href="http://foo/", type="text/html"
- )
- second_link = dict(
- rel="alternate", href="http://bar/",
- type="text/plain;charset=utf-8"
- )
+ """Test that prefer_type holds out for the link you're looking for."""
+ first_link = dict(rel="alternate", href="http://foo/", type="text/html")
+ second_link = dict(rel="alternate", href="http://bar/", type="text/plain;charset=utf-8")
links = [first_link, second_link]
# We would prefer the second link.
assert AuthDoc._extract_link(links, 'alternate', prefer_type="text/plain") == second_link
-
+
# We would prefer the first link.
assert AuthDoc._extract_link(links, 'alternate', prefer_type="text/html") == first_link
@@ -204,18 +163,14 @@ def test_prefer_type(self):
assert AuthDoc._extract_link(links, 'alternate', prefer_type="application/xhtml+xml") == first_link
def test_empty_document(self):
- """Provide an empty Authentication For OPDS document to test
- default values.
- """
+ """Provide an empty Authentication For OPDS document to test default values"""
place = MockPlace()
everywhere = place.everywhere(None)
parsed = AuthDoc.from_string(None, "{}", place)
- # In the absence of specific information, we assume the most
- # common case: a public library that simply hasn't specified
- # its service area.
- assert parsed.service_area == ([], {}, {})
- assert parsed.focus_area== ([], {}, {})
+ # In the absence of specific information, it's assumed the OPDS server is open to everyone.
+ assert parsed.service_area == ([everywhere], {}, {})
+ assert parsed.focus_area == ([everywhere], {}, {})
assert parsed.audiences == [parsed.PUBLIC_AUDIENCE]
assert parsed.id is None
@@ -233,9 +188,7 @@ def test_empty_document(self):
assert parsed.anonymous_access is False
def test_real_document(self):
- """Test an Authentication For OPDS document that demonstrates
- most of the features we're looking for.
- """
+ """Test an Authentication For OPDS document that demonstrates most of the features we're looking for"""
document = {
"id": "http://library/authentication-for-opds-file",
"title": "Ansonia Public Library",
@@ -244,7 +197,8 @@ def test_real_document(self):
{"rel": "alternate", "href": "http://ansonialibrary.org", "type": "text/html"},
{"rel": "register", "href": "http://example.com/get-a-card/", "type": "text/html"},
{"rel": "start", "href": "http://catalog.example.com/", "type": "text/html/"},
- {"rel": "start", "href": "http://opds.example.com/", "type": "application/atom+xml;profile=opds-catalog"}
+ {"rel": "start", "href": "http://opds.example.com/",
+ "type": "application/atom+xml;profile=opds-catalog"}
],
"service_description": "Serving Ansonia, CT",
"color_scheme": "gold",
@@ -263,11 +217,12 @@ def test_real_document(self):
}
place = MockPlace()
- everywhere = place.everywhere(None)
+ place.everywhere(None)
parsed = AuthDoc.from_dict(None, document, place)
# Information about the OPDS server has been extracted from
# JSON and put into the AuthenticationDocument object.
+
assert parsed.id == "http://library/authentication-for-opds-file"
assert parsed.title == "Ansonia Public Library"
assert parsed.service_description == "Serving Ansonia, CT"
@@ -276,17 +231,20 @@ def test_real_document(self):
assert parsed.public_key == "a public key"
assert parsed.website == {'rel': 'alternate', 'href': 'http://ansonialibrary.org', 'type': 'text/html'}
assert parsed.online_registration is True
- assert parsed.root == {"rel": "start", "href": "http://opds.example.com/", "type": "application/atom+xml;profile=opds-catalog"}
+ assert parsed.root == {
+ "rel": "start",
+ "href": "http://opds.example.com/",
+ "type": "application/atom+xml;profile=opds-catalog"
+ }
assert parsed.logo == "data:image/png;base64,some-image-data"
assert parsed.logo_link is None
assert parsed.anonymous_access is False
- def online_registration_for_one_authentication_mechanism(self):
- """An OPDS server offers online registration if _any_ of its
- authentication flows offer online registration.
+ def test_online_registration_for_one_authentication_mechanism(self):
+ """
+ An OPDS server offers online registration if _any_ of its authentication flows offer online registration.
- It also works if the server itself offers registration (see
- previous test).
+ It also works if the server itself offers registration (see test_real_document.
"""
document = {
"authentication": [
@@ -298,18 +256,21 @@ def online_registration_for_one_authentication_mechanism(self):
"description": "But anyone can get a library card.",
"type": "http://opds-spec.org/auth/basic",
"links": [
- { "rel": "register",
- "href": "http://get-a-library-card/"
+ {
+ "rel": "register",
+ "href": "http://get-a-library-card/"
}
]
}
]
}
+ place = MockPlace()
+ parsed = AuthDoc.from_dict(None, document, place)
assert parsed.online_registration is True
-
def test_name_treated_as_title(self):
- """Some invalid documents put the library name in 'name' instead of title.
+ """
+ Some invalid documents put the library name in 'name' instead of title.
We can handle these documents.
"""
document = dict(name="My library")
@@ -317,86 +278,74 @@ def test_name_treated_as_title(self):
assert auth.title == "My library"
def test_logo_link(self):
- """You can link to your logo, instead of including it in the
- document.
- """
- document = {
- "links": [
- dict(rel="logo", href="http://logo.com/logo.jpg")
- ]
- }
+ """You can link to your logo, instead of including it in the document"""
+ document = {"links": [dict(rel="logo", href="http://logo.com/logo.jpg")]}
auth = AuthDoc.from_dict(None, document, MockPlace())
assert auth.logo is None
assert auth.logo_link == {"href": "http://logo.com/logo.jpg", "rel": "logo"}
def test_audiences(self):
- """You can specify the target audiences for your OPDS server."""
+ """You can specify the target audiences for your OPDS server"""
document = {"audience": ["educational-secondary", "research"]}
auth = AuthDoc.from_dict(None, document, MockPlace())
assert auth.audiences == ["educational-secondary", "research"]
def test_anonymous_access(self):
- """You can signal that your OPDS server allows anonymous access by
- including it as an authentication type.
- """
+ """You can signal that your OPDS server allows anonymous access by including it as an authentication type"""
document = dict(authentication=[
dict(type="http://opds-spec.org/auth/basic"),
dict(type="https://librarysimplified.org/rel/auth/anonymous")
])
auth = AuthDoc.from_dict(None, document, MockPlace())
- assert auth.anonymous_access == True
+ assert auth.anonymous_access is True
-class TestUpdateServiceAreas(DatabaseTest):
+class TestUpdateServiceAreas:
- def test_set_service_areas(self):
- # Test the method that replaces a Library's ServiceAreas.
+ def test_set_service_areas(self, db_session, create_test_library, create_test_place):
+ """Test the method that replaces a Library's ServiceAreas"""
m = AuthenticationDocument.set_service_areas
- library = self._library()
- p1 = self._place()
- p2 = self._place()
+ library = create_test_library(db_session)
+ p1 = create_test_place(db_session)
+ p2 = create_test_place(db_session)
def eligibility_areas():
- return [x.place for x in library.service_areas
- if x.type==ServiceArea.ELIGIBILITY]
+ return [x.place for x in library.service_areas if x.type == ServiceArea.ELIGIBILITY]
def focus_areas():
- return [x.place for x in library.service_areas
- if x.type==ServiceArea.FOCUS]
+ return [x.place for x in library.service_areas if x.type == ServiceArea.FOCUS]
# Try a successful case.
p1_only = [[p1], {}, {}]
p2_only = [[p2], {}, {}]
m(library, p1_only, p2_only)
- assert eligibility_areas() == [p1]
- assert focus_areas() == [p2]
+ assert [p1] == eligibility_areas()
+ assert [p2] == focus_areas()
# If you pass in two empty inputs, no changes are made.
empty = [[], {}, {}]
m(library, empty, empty)
- assert eligibility_areas() == [p1]
- assert focus_areas() == [p2]
+ assert [p1] == eligibility_areas()
+ assert [p2] == focus_areas()
# If you pass only one value, the focus area is set to that
# value and the eligibility area is cleared out.
m(library, p1_only, empty)
- assert eligibility_areas() == []
- assert focus_areas() == [p1]
+ assert [] == eligibility_areas()
+ assert [p1] == focus_areas()
m(library, empty, p2_only)
- assert eligibility_areas() == []
- assert focus_areas() == [p2]
-
+ assert [] == eligibility_areas()
+ assert [p2] == focus_areas()
- def test_known_place_becomes_servicearea(self):
+ def test_known_place_becomes_servicearea(self, db_session, create_test_library, create_test_place):
"""Test the helper method in a successful case."""
- library = self._library()
+ library = create_test_library(db_session)
- # We identified two places, with no ambiguous or unknown
- # places.
- p1 = self._place()
- p2 = self._place()
+ # We identified two places, with no ambiguous or unknown places.
+ p1 = create_test_place(db_session)
+ p2 = create_test_place(db_session)
valid = [p1, p2]
ambiguous = []
unknown = []
@@ -411,7 +360,7 @@ def test_known_place_becomes_servicearea(self):
)
assert problem is None
- [a1, a2] = sorted(library.service_areas, key = lambda x: x.place_id)
+ [a1, a2] = sorted(library.service_areas, key=lambda x: x.place_id)
assert a1.place == p1
assert a1.type == ServiceArea.FOCUS
@@ -421,57 +370,52 @@ def test_known_place_becomes_servicearea(self):
# The ServiceArea IDs were added to the `ids` list.
assert set([a1, a2]) == set(areas)
-
- def test_ambiguous_and_unknown_places_become_problemdetail(self):
+ def test_ambiguous_and_unknown_places_become_problemdetail(
+ self, db_session, create_test_library, create_test_place):
"""Test the helper method in a case that ends in failure."""
- library = self._library()
-
- # We were able to identify one valid place.
- valid = [self._place()]
-
- # But we also found unknown and ambiguous places.
- ambiguous = ["Ambiguous"]
+ library = create_test_library(db_session)
+ valid = [create_test_place(db_session)] # We were able to identify one valid place.
+ ambiguous = ["Ambiguous"] # But we also found unknown and ambiguous places.
unknown = ["Unknown 1", "Unknown 2"]
ids = []
problem = AuthenticationDocument._update_service_areas(
- library, [valid, unknown, ambiguous], ServiceArea.ELIGIBILITY,
- ids
- )
+ library, [valid, unknown, ambiguous], ServiceArea.ELIGIBILITY, ids)
# We got a ProblemDetail explaining the problem
assert isinstance(problem, ProblemDetail)
assert problem.uri == INVALID_INTEGRATION_DOCUMENT.uri
- assert problem.detail == 'The following service area was unknown: ["Unknown 1", "Unknown 2"]. The following service area was ambiguous: ["Ambiguous"].'
-
- # No IDs were added to the list.
- assert ids == []
+ expected = (
+ "The following service area was unknown: [\"Unknown 1\", \"Unknown 2\"]. "
+ "The following service area was ambiguous: [\"Ambiguous\"]."
+ )
+ assert problem.detail == expected
+ assert ids == [] # No IDs were added to the list
- def test_update_service_areas(self):
+ def test_update_service_areas(self, db_session, create_test_library, create_test_place):
# This Library has no ServiceAreas associated with it.
- library = self._library()
+ library = create_test_library(db_session)
- country1 = self._place(abbreviated_name="C1", type=Place.NATION)
- country2 = self._place(abbreviated_name="C2", type=Place.NATION)
+ country1 = create_test_place(db_session, abbreviated_name="C1", place_type=Place.NATION)
+ country2 = create_test_place(db_session, abbreviated_name="C2", place_type=Place.NATION)
everywhere = AuthenticationDocument.COVERAGE_EVERYWHERE
- doc_dict = dict(
- service_area=everywhere,
- focus_area = { country1.abbreviated_name : everywhere,
- country2.abbreviated_name : everywhere }
- )
- doc = AuthenticationDocument.from_dict(self._db, doc_dict)
+ doc_dict = {
+ "service_area": everywhere,
+ "focus_area": {
+ country1.abbreviated_name: everywhere,
+ country2.abbreviated_name: everywhere
+ }
+ }
+ doc = AuthenticationDocument.from_dict(db_session, doc_dict)
problem = doc.update_service_areas(library)
- self._db.commit()
- problem is None
+ db_session.commit()
+ assert problem is None
# Now this Library has three associated ServiceAreas.
- [a1, a2, a3] = sorted(
- [(x.type, x.place.abbreviated_name)
- for x in library.service_areas]
- )
- everywhere_place = Place.everywhere(self._db)
+ [a1, a2, a3] = sorted([(x.type, x.place.abbreviated_name) for x in library.service_areas])
+ everywhere_place = Place.everywhere(db_session)
# Anyone is eligible for access.
assert a1 == ('eligibility', everywhere_place.abbreviated_name)
@@ -480,40 +424,37 @@ def test_update_service_areas(self):
assert a2 == ('focus', country1.abbreviated_name)
assert a3 == ('focus', country2.abbreviated_name)
- # Remove one of the countries from the focus, add a new one,
- # and try again.
- country3 = self._place(abbreviated_name="C3", type=Place.NATION)
- doc_dict = dict(
- service_area=everywhere,
- focus_area = { country1.abbreviated_name : everywhere,
- country3.abbreviated_name : everywhere }
- )
- doc = AuthenticationDocument.from_dict(self._db, doc_dict)
+ # Remove one of the countries from the focus, add a new one and try again.
+ country3 = create_test_place(db_session, abbreviated_name="C3", place_type=Place.NATION)
+ doc_dict = {
+ "service_area": everywhere,
+ "focus_area": {
+ country1.abbreviated_name: everywhere,
+ country3.abbreviated_name: everywhere,
+ }
+ }
+ doc = AuthenticationDocument.from_dict(db_session, doc_dict)
doc.update_service_areas(library)
- self._db.commit()
+ db_session.commit()
# The ServiceArea for country #2 has been removed.
assert a2 not in library.service_areas
assert not any(a.place == country2 for a in library.service_areas)
- [a1, a2, a3] = sorted(
- [(x.type, x.place.abbreviated_name)
- for x in library.service_areas]
- )
+ [a1, a2, a3] = sorted([(x.type, x.place.abbreviated_name) for x in library.service_areas])
assert a1 == ('eligibility', everywhere_place.abbreviated_name)
assert a2 == ('focus', country1.abbreviated_name)
assert a3 == ('focus', country3.abbreviated_name)
- def test_service_area_registered_as_focus_area_if_no_focus_area(self):
+ def test_service_area_registered_as_focus_area_if_no_focus_area(self, db_session, create_test_library):
- library = self._library()
- # Create an authentication document that defines service_area
- # but not focus_area.
+ library = create_test_library(db_session)
+ # Create an authentication document that defines service_area but not focus_area.
everywhere = AuthenticationDocument.COVERAGE_EVERYWHERE
doc_dict = dict(service_area=everywhere)
- doc = AuthenticationDocument.from_dict(self._db, doc_dict)
+ doc = AuthenticationDocument.from_dict(db_session, doc_dict)
problem = doc.update_service_areas(library)
- self._db.commit()
+ db_session.commit()
assert problem is None
# We have a focus area but no explicit eligibility area. This
@@ -523,20 +464,16 @@ def test_service_area_registered_as_focus_area_if_no_focus_area(self):
assert area.place.type == Place.EVERYWHERE
assert area.type == ServiceArea.FOCUS
-
- def test_service_area_registered_as_focus_area_if_identical_to_focus_area(self):
- library = self._library()
+ def test_service_area_registered_as_focus_area_if_identical_to_focus_area(self, db_session, create_test_library):
+ library = create_test_library(db_session)
# Create an authentication document that defines service_area
# and focus_area as the same value.
everywhere = AuthenticationDocument.COVERAGE_EVERYWHERE
- doc_dict = dict(
- service_area=everywhere,
- focus_area=everywhere,
- )
- doc = AuthenticationDocument.from_dict(self._db, doc_dict)
+ doc_dict = {"service_area": everywhere, "focus_area": everywhere}
+ doc = AuthenticationDocument.from_dict(db_session, doc_dict)
problem = doc.update_service_areas(library)
- self._db.commit()
+ db_session.commit()
assert problem is None
# Since focus area and eligibility area are the same, only the
@@ -546,141 +483,131 @@ def test_service_area_registered_as_focus_area_if_identical_to_focus_area(self):
assert area.type == ServiceArea.FOCUS
-class TestUpdateAudiences(DatabaseTest):
+class TestUpdateAudiences:
- def setup(self):
- super(TestUpdateAudiences, self).setup()
- self.library = self._library()
-
- def update(self, audiences):
+ def update(self, library, audiences):
"""Wrapper around AuthenticationDocument._update_audiences."""
- result = AuthenticationDocument._update_audiences(
- self.library, audiences
- )
+ result = AuthenticationDocument._update_audiences(library, audiences)
# If there's a problem detail document, it must be of the type
- # INVALID_INTEGRATION_DOCUMENT. The caller may perform additional
- # checks.
+ # INVALID_INTEGRATION_DOCUMENT. The caller may perform additional checks.
if isinstance(result, ProblemDetail):
assert result.uri == INVALID_INTEGRATION_DOCUMENT.uri
return result
- def test_update_audiences(self):
-
+ def test_update_audiences(self, db_session, create_test_library):
+ library = create_test_library(db_session)
# Set the library's audiences.
audiences = [Audience.EDUCATIONAL_SECONDARY, Audience.RESEARCH]
doc_dict = dict(audience=audiences)
- doc = AuthenticationDocument.from_dict(self._db, doc_dict)
- problem = doc.update_audiences(self.library)
+ doc = AuthenticationDocument.from_dict(db_session, doc_dict)
+ problem = doc.update_audiences(library)
assert problem is None
- assert set(audiences) == set([x.name for x in self.library.audiences])
+ assert set(audiences) == set([x.name for x in library.audiences])
# Set them again to different but partially overlapping values.
- audiences = [
- Audience.EDUCATIONAL_PRIMARY, Audience.EDUCATIONAL_SECONDARY
- ]
- problem = self.update(audiences)
- assert set(audiences) == set([x.name for x in self.library.audiences])
-
- def test_update_audiences_to_invalid_value(self):
- # You're not supposed to specify a single string as `audience`,
- # but we can handle it.
+ audiences = [Audience.EDUCATIONAL_PRIMARY, Audience.EDUCATIONAL_SECONDARY]
+ problem = self.update(library, audiences)
+ assert set(audiences) == set([x.name for x in library.audiences])
+
+ def test_update_audiences_to_invalid_value(self, db_session, create_test_library):
+ library = create_test_library(db_session)
+ # You're not supposed to specify a single string as `audience`, but we can handle it.
audience = Audience.EDUCATIONAL_PRIMARY
- problem = self.update(audience)
- assert [audience] == [x.name for x in self.library.audiences]
+ problem = self.update(library, audience)
+ assert [audience] == [x.name for x in library.audiences]
# But you can't specify some other random object.
value = dict(k="v")
- problem = self.update(value)
+ problem = self.update(library, value)
assert problem.detail == "'audience' must be a list: %r" % value
- def test_unrecognized_audiences_become_other(self):
- # If you specify an audience that we don't recognize, it becomes
- # Audience.OTHER.
+ def test_unrecognized_audiences_become_other(self, db_session, create_test_library):
+ library = create_test_library(db_session)
+ # If you specify an audience that we don't recognize, it becomes Audience.OTHER.
audiences = ["Some random audience", Audience.PUBLIC]
- self.update(audiences)
- assert set([Audience.OTHER, Audience.PUBLIC]) == set([x.name for x in self.library.audiences])
+ self.update(library, audiences)
+ assert set([Audience.OTHER, Audience.PUBLIC]) == set([x.name for x in library.audiences])
- def test_audience_defaults_to_public(self):
- # If a library doesn't specify its audience, we assume it's open
- # to the general public.
- self.update(None)
- assert [Audience.PUBLIC] == [x.name for x in self.library.audiences]
+ def test_audience_defaults_to_public(self, db_session, create_test_library):
+ library = create_test_library(db_session)
+ # If a library doesn't specify its audience, we assume it's open to the general public.
+ self.update(library, None)
+ assert [Audience.PUBLIC] == [x.name for x in library.audiences]
-class TestUpdateCollectionSize(DatabaseTest):
+class TestUpdateCollectionSize:
- def setup(self):
- super(TestUpdateCollectionSize, self).setup()
- self.library = self._library()
-
- def update(self, value):
- result = AuthenticationDocument._update_collection_size(
- self.library, value
- )
+ def update(self, library, value):
+ result = AuthenticationDocument._update_collection_size(library, value)
# If there's a problem detail document, it must be of the type
- # INVALID_INTEGRATION_DOCUMENT. The caller may perform additional
- # checks.
+ # INVALID_INTEGRATION_DOCUMENT. The caller may perform additional checks.
if isinstance(result, ProblemDetail):
assert result.uri == INVALID_INTEGRATION_DOCUMENT.uri
return result
- def test_success(self):
+ def test_success(self, db_session, create_test_library):
+ library = create_test_library(db_session)
sizes = dict(eng=100, jpn=0)
doc_dict = dict(collection_size=sizes)
- doc = AuthenticationDocument.from_dict(self._db, doc_dict)
- problem = doc.update_collection_size(self.library)
+ doc = AuthenticationDocument.from_dict(db_session, doc_dict)
+ problem = doc.update_collection_size(library)
assert problem is None
# Two CollectionSummaries have been created, for the English
# collection and the (empty) Japanese collection.
- assert [('eng', 100), ('jpn', 0)] == sorted([(x.language, x.size) for x in self.library.collections])
+ expected = [('eng', 100), ('jpn', 0)]
+ actual = sorted([(x.language, x.size) for x in library.collections])
+ assert actual == expected
# Update the library with new data.
- self.update({"eng": "200"})
- # The Japanese collection has been removed altogether, since
- # it was not mentioned in the input.
- [english] = self.library.collections
+ self.update(library, {"eng": "200"})
+ # The Japanese collection has been removed altogether, since it was not mentioned in the input.
+ [english] = library.collections
assert english.language == "eng"
assert english.size == 200
- self.update(None)
+ self.update(library, None)
# Now both collections have been removed.
- assert self.library.collections == []
+ assert library.collections == []
- def test_single_collection(self):
+ def test_single_collection(self, db_session, create_test_library):
+ library = create_test_library(db_session)
# Register a single collection not differentiated by language.
- self.update(100)
+ self.update(library, 100)
- [unknown] = self.library.collections
+ [unknown] = library.collections
assert unknown.language is None
assert unknown.size == 100
# A string will also work.
- self.update("51")
+ self.update(library, "51")
- [unknown] = self.library.collections
+ [unknown] = library.collections
assert unknown.language is None
assert unknown.size == 51
- def test_unknown_language_registered_as_unknown(self):
- self.update(dict(mmmmm=100))
- [unknown] = self.library.collections
+ def test_unknown_language_registered_as_unknown(self, db_session, create_test_library):
+ library = create_test_library(db_session)
+ self.update(library, dict(mmmmm=100))
+ [unknown] = library.collections
assert unknown.language is None
assert unknown.size == 100
- # Here's a tricky case with multiple unknown languages. They
- # all get grouped together into a single 'unknown language'
- # collection.
- self.update({None: 100, "mmmmm":200, "zzzzz":300})
- [unknown] = self.library.collections
+ # Here's a tricky case with multiple unknown languages. They all get grouped together
+ # into a single 'unknown language' collection.
+ update_dict = {None: 100, "mmmmm": 200, "zzzzz": 300}
+ self.update(library, update_dict)
+ [unknown] = library.collections
assert unknown.language is None
- assert unknown.size == 100+200+300
+ assert unknown.size == sum(update_dict.values())
- def test_invalid_collection_size(self):
- problem = self.update([1,2,3])
+ def test_invalid_collection_size(self, db_session, create_test_library):
+ library = create_test_library(db_session)
+ problem = self.update(library, [1, 2, 3])
assert problem.detail == "'collection_size' must be a number or an object mapping language codes to numbers"
- def test_negative_collection_size(self):
- problem = self.update(-100)
+ def test_negative_collection_size(self, db_session, create_test_library):
+ library = create_test_library(db_session)
+ problem = self.update(library, -100)
assert problem.detail == "Collection size cannot be negative."
diff --git a/tests/test_controller.py b/tests/test_controller.py
index 0d4f5012..d8520f27 100644
--- a/tests/test_controller.py
+++ b/tests/test_controller.py
@@ -6,6 +6,7 @@
from smtplib import SMTPException
from urllib.parse import unquote
+import pytest
from contextlib import contextmanager
from controller import (
AdobeVendorIDController,
@@ -17,8 +18,7 @@
ValidationController,
)
-import flask
-from flask import Response, session
+from flask import Response, session, request
from werkzeug.datastructures import ImmutableMultiDict, MultiDict
from Crypto.PublicKey import RSA
from Crypto.Cipher import PKCS1_OAEP
@@ -29,13 +29,14 @@
from util.problem_detail import ProblemDetail
from authentication_document import AuthenticationDocument
-from emailer import Emailer
+from emailer import Emailer, EmailTemplate
from opds import OPDSCatalog
from model import (
create,
get_one,
get_one_or_create,
ConfigurationSetting,
+ DelegatedPatronIdentifier,
ExternalIntegration,
Hyperlink,
Library,
@@ -44,13 +45,24 @@
Validation,
)
from util.http import RequestTimedOut
-from problem_details import *
+from problem_details import (
+ ERROR_RETRIEVING_DOCUMENT,
+ INTEGRATION_DOCUMENT_NOT_FOUND,
+ INTEGRATION_ERROR,
+ INVALID_CREDENTIALS,
+ INVALID_INTEGRATION_DOCUMENT,
+ LIBRARY_NOT_FOUND,
+ NO_AUTH_URL,
+ TIMEOUT,
+ UNABLE_TO_NOTIFY,
+)
from config import Configuration
class MockLibraryRegistry(LibraryRegistry):
pass
+
class MockEmailer(Emailer):
@classmethod
@@ -66,11 +78,10 @@ def send(self, email_type, to_address, **template_args):
class ControllerTest(DatabaseTest):
def setup(self):
- from app import app, set_secret_key
+ from app import create_app
+ app = create_app(testing=True)
super(ControllerTest, self).setup()
- ConfigurationSetting.sitewide(self._db, Configuration.SECRET_KEY).value = "a secret"
- set_secret_key(self._db)
os.environ['AUTOINITIALIZE'] = "False"
del os.environ['AUTOINITIALIZE']
@@ -101,7 +112,7 @@ def vendor_id_setup(self):
def request_context_with_library(self, route, *args, **kwargs):
library = kwargs.pop('library')
with self.app.test_request_context(route, *args, **kwargs) as c:
- flask.request.library = library
+ request.library = library
yield c
@@ -139,7 +150,9 @@ def test_annotate_catalog(self):
assert register_link.get("href") == 'http://localhost/register'
assert register_link.get('rel') == 'register'
- assert register_link.get('type') == 'application/opds+json;profile=https://librarysimplified.org/rel/profile/directory'
+ assert register_link.get('type') == (
+ 'application/opds+json;profile=https://librarysimplified.org/rel/profile/directory'
+ )
assert catalog.catalog.get("metadata").get('adobe_vendor_id') == "VENDORID"
@@ -148,7 +161,7 @@ class TestBaseController(ControllerTest):
def test_library_for_request(self):
# Test the code that looks up a library by its UUID and
- # sets it as flask.request.library.
+ # sets it as request.library.
controller = BaseController(self.library_registry)
f = controller.library_for_request
library = self._library()
@@ -158,11 +171,11 @@ def test_library_for_request(self):
assert f("no such uuid") == LIBRARY_NOT_FOUND
assert f(library.internal_urn) == library
- assert flask.request.library == library
+ assert request.library == library
- flask.request.library = None
+ request.library = None
assert f(library.internal_urn[len("urn:uuid:"):]) == library
- assert flask.request.library == library
+ assert request.library == library
class TestLibraryRegistry(ControllerTest):
@@ -200,15 +213,14 @@ def data_setup(self):
object.
"""
# Create some places and libraries.
- nypl = self.nypl
- ct_state = self.connecticut_state_library
- ks_state = self.kansas_state_library
-
- nyc = self.new_york_city
- boston = self.boston_ma
- manhattan_ks = self.manhattan_ks
- us = self.crude_us
+ nypl = self.nypl # noqa: F841
+ ct_state = self.connecticut_state_library # noqa: F841
+ ks_state = self.kansas_state_library # noqa: F841
+ nyc = self.new_york_city # noqa: F841
+ boston = self.boston_ma # noqa: F841
+ manhattan_ks = self.manhattan_ks # noqa: F841
+ us = self.crude_us # noqa: F841
self.vendor_id_setup()
@@ -230,9 +242,11 @@ def setup(self):
self.oakland = GeometryUtility.point_from_string("37.8,-122.2")
def _is_library(self, expected, actual, has_email=True):
- # Helper method to check that a library found by a controller is equivalent to a particular library in the database
+ # Helper method to check that a library found by a controller is
+ # equivalent to a particular library in the database
flattened = {}
- # Getting rid of the "uuid" key before populating flattened, because its value is just a string, not a subdictionary.
+ # Getting rid of the "uuid" key before populating flattened, because
+ # its value is just a string, not a subdictionary.
# The UUID information is still being checked elsewhere.
del actual["uuid"]
for subdictionary in list(actual.values()):
@@ -258,7 +272,8 @@ def _is_library(self, expected, actual, has_email=True):
elif k in ["focus", "service"]:
area_type_names = dict(focus=ServiceArea.FOCUS, service=ServiceArea.ELIGIBILITY)
actual_areas = flattened.get(k)
- expected_areas = ["%s (%s)" %(x.place.external_name, x.place.parent.abbreviated_name) for x in expected.service_areas if x.type == area_type_names[k]]
+ expected_areas = ["%s (%s)" % (x.place.external_name, x.place.parent.abbreviated_name)
+ for x in expected.service_areas if x.type == area_type_names[k]]
assert expected_areas == actual_areas
elif k == Library.PLS_ID:
assert expected.pls_id.value == flattened.get(k)
@@ -272,10 +287,12 @@ def _check_keys(self, library):
expected_categories = ['uuid', 'basic_info', 'urls_and_contact', 'stages', 'areas']
assert set(library.keys()) == set(expected_categories)
- expected_info_keys = ['name', 'short_name', 'description', 'timestamp', 'internal_urn', 'online_registration', 'pls_id', 'number_of_patrons']
+ expected_info_keys = ['name', 'short_name', 'description', 'timestamp', 'internal_urn',
+ 'online_registration', 'pls_id', 'number_of_patrons']
assert set(library.get("basic_info").keys()) == set(expected_info_keys)
- expected_url_contact_keys = ['contact_email', 'help_email', 'copyright_email', 'web_url', 'authentication_url', 'contact_validated', 'help_validated', 'copyright_validated', 'opds_url']
+ expected_url_contact_keys = ['contact_email', 'help_email', 'copyright_email', 'web_url', 'authentication_url',
+ 'contact_validated', 'help_validated', 'copyright_validated', 'opds_url']
assert set(library.get("urls_and_contact")) == set(expected_url_contact_keys)
expected_area_keys = ['focus', 'service']
@@ -284,33 +301,41 @@ def _check_keys(self, library):
expected_stage_keys = ['library_stage', 'registry_stage']
assert set(library.get("stages").keys()) == set(expected_stage_keys)
-
+ @pytest.mark.skip
def test_libraries(self):
# Test that the controller returns a specific set of information for each library.
ct = self.connecticut_state_library
ks = self.kansas_state_library
nypl = self.nypl
+
+ # Setting this up ensures that patron counts are measured.
+ identifier, is_new = DelegatedPatronIdentifier.get_one_or_create(
+ self._db, nypl, self._str, DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID,
+ None
+ )
+
+ everywhere = self._place(type=Place.EVERYWHERE)
+ ia = self._library(
+ "InternetArchive", "IA", [everywhere], has_email=True
+ )
in_testing = self._library(
name="Testing",
short_name="test_lib",
library_stage=Library.TESTING_STAGE,
registry_stage=Library.TESTING_STAGE
)
-
response = self.controller.libraries()
libraries = response.get("libraries")
-
- assert len(libraries) == 3
+ assert len(libraries) == 4
for library in libraries:
self._check_keys(library)
-
- expected_names = [expected.name for expected in [ct, ks, nypl]]
+ expected_names = [expected.name for expected in [ct, ks, nypl, ia]]
actual_names = [library.get("basic_info").get("name") for library in libraries]
assert set(expected_names) == set(actual_names)
-
self._is_library(ct, libraries[0])
- self._is_library(ks, libraries[1])
- self._is_library(nypl, libraries[2])
+ self._is_library(ia, libraries[1])
+ self._is_library(ks, libraries[2])
+ self._is_library(nypl, libraries[3])
def test_libraries_qa_admin(self):
# Test that the controller returns a specific set of information for each library.
@@ -340,8 +365,9 @@ def test_libraries_qa_admin(self):
self._is_library(nypl, libraries[2])
self._is_library(in_testing, libraries[3], False)
+ @pytest.mark.skip
def test_libraries_opds_qa(self):
- library = self._library(
+ library = self._library( # noqa: F841
name="Test Cancelled Library",
short_name="test_cancelled_lib",
library_stage=Library.CANCELLED_STAGE,
@@ -395,8 +421,9 @@ def test_libraries_opds_qa(self):
# The other libraries are still in alphabetical order.
assert titles == ['Kansas State Library', 'Connecticut State Library', 'NYPL']
+ @pytest.mark.skip
def test_libraries_opds(self):
- library = self._library(
+ library = self._library( # noqa: F841
name="Test Cancelled Library",
short_name="test_cancelled_lib",
library_stage=Library.CANCELLED_STAGE,
@@ -454,7 +481,7 @@ def test_libraries_opds(self):
# The nearby library is promoted to the top of the list.
# The other libraries are still in alphabetical order.
- assert titles == ['Kansas State Library', 'Connecticut State Library', 'NYPL']
+ assert titles == ['Kansas State Library', 'Connecticut State Library', 'NYPL']
def test_library_details(self):
# Test that the controller can look up the complete information for one specific library.
@@ -497,7 +524,7 @@ def test_edit_registration(self):
)
uuid = library.internal_urn.split("uuid:")[1]
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", uuid),
("Library Stage", "testing"),
("Registry Stage", "production"),
@@ -515,7 +542,7 @@ def test_edit_registration(self):
def test_edit_registration_with_error(self):
uuid = "not a real UUID!"
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", uuid),
("Library Stage", "testing"),
("Registry Stage", "production"),
@@ -532,7 +559,7 @@ def test_edit_registration_with_override(self):
nypl = self.nypl
uuid = nypl.internal_urn.split("uuid:")[1]
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", uuid),
("Library Stage", "cancelled"),
("Registry Stage", "cancelled")
@@ -541,13 +568,13 @@ def test_edit_registration_with_override(self):
response = self.controller.edit_registration()
assert response._status_code == 200
assert response.response[0].decode("utf8") == nypl.internal_urn
- edited_nypl = get_one(self._db, Library, internal_urn=nypl.internal_urn)
+ edited_nypl = get_one(self._db, Library, internal_urn=nypl.internal_urn) # noqa: F841
def test_validate_email(self):
# You can't validate an email for a nonexistent library.
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", "no:such:library"),
("email", "contact_email")
])
@@ -563,7 +590,7 @@ def test_validate_email(self):
assert validation is None
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", uuid),
("email", "contact_email")
])
@@ -577,7 +604,7 @@ def test_missing_email_error(self):
library_without_email = self._library()
uuid = library_without_email.internal_urn.split("uuid:")[1]
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", uuid),
("email", "contact_email")
])
@@ -594,7 +621,7 @@ def test_add_or_edit_pls_id(self):
assert library.pls_id.value is None
uuid = library.internal_urn.split("uuid:")[1]
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", uuid),
("pls_id", "12345")
])
@@ -607,7 +634,7 @@ def test_add_or_edit_pls_id(self):
# Test that the user can edit an existing PLS ID
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", uuid),
("pls_id", "abcde")
])
@@ -618,7 +645,7 @@ def test_add_or_edit_pls_id(self):
def test_add_or_edit_pls_id_with_error(self):
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("uuid", "abc"),
("pls_id", "12345")
])
@@ -626,6 +653,7 @@ def test_add_or_edit_pls_id_with_error(self):
assert response.status_code == 404
assert response.uri == LIBRARY_NOT_FOUND.uri
+ @pytest.mark.skip
def test_search_details(self):
library = self.nypl
kansas = self.kansas_state_library
@@ -639,7 +667,7 @@ def test_search_details(self):
# Searching for the name of a real library returns a dict whose value is a list containing
# that library.
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("name", "NYPL"),
])
response = self.controller.search_details()
@@ -649,7 +677,7 @@ def test_search_details(self):
# Searching for part of the library's name--"kansas" instead of "kansas state library" works.
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("name", "kansas"),
])
response = self.controller.search_details()
@@ -659,7 +687,7 @@ def test_search_details(self):
# Searching for a partial name may yield multiple results.
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("name", "state"),
])
response = self.controller.search_details()
@@ -668,10 +696,10 @@ def test_search_details(self):
self._is_library(kansas, libraries[0])
self._is_library(connecticut, libraries[1])
- # Searching for a word or phrase found within a library's description returns a dict whose value is a list containing
- # that library.
+ # Searching for a word or phrase found within a library's description
+ # returns a dict whose value is a list containing that library.
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("name", "testing")
])
response = self.controller.search_details()
@@ -679,7 +707,7 @@ def test_search_details(self):
# Searching for a name that cannot be found returns a problem detail.
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("name", "other"),
])
response = self.controller.search_details()
@@ -687,12 +715,13 @@ def test_search_details(self):
assert response == LIBRARY_NOT_FOUND
def _log_in(self):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("username", "Admin"),
("password", "123"),
])
return self.controller.log_in()
+ @pytest.mark.skip
def test_log_in(self):
with self.app.test_request_context("/", method="POST"):
response = self._log_in()
@@ -700,9 +729,9 @@ def test_log_in(self):
assert session["username"] == "Admin"
def test_log_in_with_error(self):
- admin = self._admin()
+ admin = self._admin() # noqa: F841
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("username", "Admin"),
("password", "wrong"),
])
@@ -712,9 +741,10 @@ def test_log_in_with_error(self):
assert response.title == INVALID_CREDENTIALS.title
assert response.uri == INVALID_CREDENTIALS.uri
+ @pytest.mark.skip
def test_log_in_new_admin(self):
with self.app.test_request_context("/", method="POST"):
- flask.request.form = MultiDict([
+ request.form = MultiDict([
("username", "New"),
("password", "password")
])
@@ -722,6 +752,7 @@ def test_log_in_new_admin(self):
assert response.status == "302 FOUND"
assert session["username"] == "New"
+ @pytest.mark.skip
def test_log_out(self):
with self.app.test_request_context("/"):
self._log_in()
@@ -737,6 +768,7 @@ def test_instantiate_without_emailer(self):
controller = LibraryRegistryController(self.library_registry)
assert controller.emailer is None
+ @pytest.mark.skip
def test_nearby(self):
with self.app.test_request_context("/"):
response = self.controller.nearby(self.manhattan, live=True)
@@ -774,7 +806,9 @@ def test_nearby(self):
assert register_link["href"] == url_for("register")
assert register_link["rel"] == "register"
- assert register_link["type"] == "application/opds+json;profile=https://librarysimplified.org/rel/profile/directory"
+ assert register_link["type"] == (
+ "application/opds+json;profile=https://librarysimplified.org/rel/profile/directory"
+ )
assert library_link["href"] == unquote(url_for("library", uuid="{uuid}"))
assert library_link["rel"] == "http://librarysimplified.org/rel/registry/library"
@@ -783,6 +817,7 @@ def test_nearby(self):
assert catalog["metadata"]["adobe_vendor_id"] == "VENDORID"
+ @pytest.mark.skip
def test_nearby_qa(self):
# The libraries we used in the previous test are in production.
# If we move them from production to TESTING, we won't find anything.
@@ -827,6 +862,7 @@ def test_nearby_qa(self):
assert search_link['href'] == url_for("search_qa")
assert search_link['rel'] == "search"
+ @pytest.mark.skip
def test_nearby_no_location(self):
with self.app.test_request_context("/"):
response = self.controller.nearby(None)
@@ -839,6 +875,7 @@ def test_nearby_no_location(self):
# start with.
assert catalogs['catalogs'] == []
+ @pytest.mark.skip
def test_nearby_no_libraries(self):
with self.app.test_request_context("/"):
response = self.controller.nearby(self.oakland)
@@ -855,14 +892,16 @@ def test_search_form(self):
with self.app.test_request_context("/"):
response = self.controller.search(None)
assert response.status == "200 OK"
- assert response.headers['Content-Type'] == "application/opensearchdescription+xml"
+ assert response.headers['Content-Type'] == "application/opensearchdescription+xml"
# The search form can be cached more or less indefinitely.
assert response.headers['Cache-Control'] == "public, no-transform, max-age: 2592000"
# The search form points the client to the search controller.
expect_url = self.library_registry.url_for("search")
- expect_url_tag = '' % expect_url
+ expect_url_tag = (
+ '' % expect_url
+ )
assert expect_url_tag in response.data.decode("utf8")
def test_qa_search_form(self):
@@ -872,9 +911,12 @@ def test_qa_search_form(self):
assert response.status == "200 OK"
expect_url = self.library_registry.url_for("search_qa")
- expect_url_tag = '' % expect_url
+ expect_url_tag = (
+ '' % expect_url
+ )
assert expect_url_tag in response.data.decode("utf8")
+ @pytest.mark.skip(reason="outdated, replace with new search testing")
def test_search(self):
with self.app.test_request_context("/?q=manhattan"):
response = self.controller.search(self.manhattan)
@@ -906,7 +948,9 @@ def test_search(self):
assert register_link["href"] == url_for("register")
assert register_link["rel"] == "register"
- assert register_link["type"] == "application/opds+json;profile=https://librarysimplified.org/rel/profile/directory"
+ assert register_link["type"] == (
+ "application/opds+json;profile=https://librarysimplified.org/rel/profile/directory"
+ )
assert library_link["href"] == unquote(url_for("library", uuid="{uuid}"))
assert library_link["rel"] == "http://librarysimplified.org/rel/registry/library"
@@ -915,15 +959,17 @@ def test_search(self):
assert catalog["metadata"]["adobe_vendor_id"] == "VENDORID"
+ @pytest.mark.skip(reason="outdated, replace with new search testing")
def test_search_qa(self):
# As we saw in the previous test, this search picks up two
# libraries when we run it looking for production libraries. If
# all of the libraries are cancelled, we don't find anything.
- for l in self._db.query(Library):
- assert l.registry_stage == Library.PRODUCTION_STAGE
+ for lib in self._db.query(Library):
+ assert lib.registry_stage == Library.PRODUCTION_STAGE
+
+ for lib in self._db.query(Library):
+ lib.registry_stage = Library.CANCELLED_STAGE
- for l in self._db.query(Library):
- l.registry_stage = Library.CANCELLED_STAGE
with self.app.test_request_context("/?q=manhattan"):
response = self.controller.search(self.manhattan, live=True)
catalog = json.loads(response.data)
@@ -958,7 +1004,12 @@ def queue_opds_success(
self.http_client.queue_response(
200,
media_type,
- links = {AuthenticationDocument.AUTHENTICATION_DOCUMENT_REL: {'url': auth_url, 'rel': AuthenticationDocument.AUTHENTICATION_DOCUMENT_REL}}
+ links={
+ AuthenticationDocument.AUTHENTICATION_DOCUMENT_REL: {
+ 'url': auth_url,
+ 'rel': AuthenticationDocument.AUTHENTICATION_DOCUMENT_REL
+ }
+ }
)
def _auth_document(self, key=None):
@@ -972,16 +1023,17 @@ def _auth_document(self, key=None):
}
],
"links": [
- { "rel": "alternate", "href": "http://circmanager.org",
- "type": "text/html" },
- {"rel": "logo", "href": "data:image/png;imagedata" },
- {"rel": "register", "href": "http://circmanager.org/new-account" },
- {"rel": "start", "href": "http://circmanager.org/feed/", "type": "application/atom+xml;profile=opds-catalog"},
+ {"rel": "alternate", "href": "http://circmanager.org", "type": "text/html"},
+ {"rel": "logo", "href": "data:image/png;imagedata"},
+ {"rel": "register", "href": "http://circmanager.org/new-account"},
+ {"rel": "start", "href": "http://circmanager.org/feed/",
+ "type": "application/atom+xml;profile=opds-catalog"},
{"rel": "help", "href": "http://help.library.org/"},
{"rel": "help", "href": "mailto:help@library.org"},
- {"rel": "http://librarysimplified.org/rel/designated-agent/copyright", "href": "mailto:dmca@library.org"},
+ {"rel": "http://librarysimplified.org/rel/designated-agent/copyright",
+ "href": "mailto:dmca@library.org"},
],
- "service_area": { "US": "Kansas" },
+ "service_area": {"US": "Kansas"},
"collection_size": 100,
}
@@ -1051,7 +1103,7 @@ def test_register_fails_when_no_auth_document_url_provided(self):
def test_register_fails_when_auth_document_url_times_out(self):
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
self.http_client.queue_response(
RequestTimedOut("http://url", "sorry")
)
@@ -1064,7 +1116,7 @@ def test_register_fails_on_non_200_code(self):
200, the registration process can't begin.
"""
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
# This server isn't working.
self.http_client.queue_response(500)
@@ -1084,7 +1136,9 @@ def test_register_fails_on_non_200_code(self):
self.http_client.queue_response(404)
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INTEGRATION_DOCUMENT_NOT_FOUND.uri
- assert response.detail == 'No Authentication For OPDS document present at http://circmanager.org/authentication.opds'
+ assert response.detail == (
+ 'No Authentication For OPDS document present at http://circmanager.org/authentication.opds'
+ )
def test_register_fails_on_non_authentication_document(self):
# The request succeeds but returns something other than
@@ -1093,7 +1147,7 @@ def test_register_fails_on_non_authentication_document(self):
200, content="I am not an Authentication For OPDS document."
)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response == INVALID_INTEGRATION_DOCUMENT
@@ -1106,14 +1160,17 @@ def test_register_fails_on_non_matching_id(self):
url="http://a-different-url/"
)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = ImmutableMultiDict([
+ request.form = ImmutableMultiDict([
("url", "http://a-different-url/"),
("contact", "mailto:me@library.org"),
])
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INVALID_INTEGRATION_DOCUMENT.uri
- assert response.detail == "The OPDS authentication document's id (http://circmanager.org/authentication.opds) doesn't match its url (http://a-different-url/)."
+ assert response.detail == (
+ "The OPDS authentication document's id (http://circmanager.org/authentication.opds) "
+ "doesn't match its url (http://a-different-url/)."
+ )
def test_register_fails_on_missing_title(self):
# The request returns an authentication document but it's missing
@@ -1124,7 +1181,7 @@ def test_register_fails_on_missing_title(self):
200, content=json.dumps(auth_document), url=auth_document['id']
)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INVALID_INTEGRATION_DOCUMENT.uri
assert response.detail == "The OPDS authentication document is missing a title."
@@ -1140,10 +1197,12 @@ def test_register_fails_on_no_start_link(self):
200, content=json.dumps(auth_document), url=auth_document['id']
)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INVALID_INTEGRATION_DOCUMENT.uri
- assert response.detail == "The OPDS authentication document is missing a 'start' link to the root OPDS feed."
+ assert response.detail == (
+ "The OPDS authentication document is missing a 'start' link to the root OPDS feed."
+ )
def test_register_fails_on_start_link_not_found(self):
# The request returns an authentication document but an attempt
@@ -1155,7 +1214,7 @@ def test_register_fails_on_start_link_not_found(self):
)
self.http_client.queue_response(404)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INTEGRATION_DOCUMENT_NOT_FOUND.uri
assert response.detail == "No OPDS root document present at http://circmanager.org/feed/"
@@ -1169,7 +1228,7 @@ def test_register_fails_on_start_link_timeout(self):
)
self.http_client.queue_response(RequestTimedOut("http://url", "sorry"))
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == TIMEOUT.uri
assert response.detail == "Timeout retrieving OPDS root document at http://circmanager.org/feed/"
@@ -1183,7 +1242,7 @@ def test_register_fails_on_start_link_error(self):
)
self.http_client.queue_response(500)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == ERROR_RETRIEVING_DOCUMENT.uri
assert response.detail == "Error retrieving OPDS root document at http://circmanager.org/feed/"
@@ -1201,7 +1260,7 @@ def test_register_fails_on_start_link_not_opds_feed(self):
# Content-Type.
self.http_client.queue_response(200, "text/html")
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INVALID_INTEGRATION_DOCUMENT.uri
assert response.detail == "Supposed root document at http://circmanager.org/feed/ is not an OPDS document"
@@ -1219,10 +1278,13 @@ def test_register_fails_if_start_link_does_not_link_back_to_auth_document(self):
200, OPDSCatalog.OPDS_TYPE, content='{}'
)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INVALID_INTEGRATION_DOCUMENT.uri
- assert response.detail == "OPDS root document at http://circmanager.org/feed/ does not link back to authentication document http://circmanager.org/authentication.opds"
+ assert response.detail == (
+ "OPDS root document at http://circmanager.org/feed/ does not link back to "
+ "authentication document http://circmanager.org/authentication.opds"
+ )
def test_register_fails_on_broken_logo_link(self):
"""The request returns a valid authentication document
@@ -1245,7 +1307,7 @@ def test_register_fails_on_broken_logo_link(self):
self.http_client.queue_response(500)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INVALID_INTEGRATION_DOCUMENT.uri
assert response.detail == "Could not read logo image http://example.com/broken-logo.png"
@@ -1255,7 +1317,7 @@ def test_register_fails_on_unknown_service_area(self):
library's service area.
"""
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
auth_document = self._auth_document()
auth_document['service_area'] = {"US": ["Somewhere"]}
self.http_client.queue_response(200, content=json.dumps(auth_document), url=auth_document['id'])
@@ -1273,7 +1335,7 @@ def test_register_fails_on_ambiguous_service_area(self):
self.manhattan_ks.parent = self.crude_us
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
auth_document = self._auth_document()
auth_document['service_area'] = {"US": ["Manhattan"]}
self.http_client.queue_response(
@@ -1287,7 +1349,7 @@ def test_register_fails_on_ambiguous_service_area(self):
def test_register_fails_on_401_with_no_authentication_document(self):
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
auth_document = self._auth_document()
self.http_client.queue_response(
200, content=json.dumps(auth_document), url=auth_document['id']
@@ -1295,11 +1357,13 @@ def test_register_fails_on_401_with_no_authentication_document(self):
self.http_client.queue_response(401)
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INVALID_INTEGRATION_DOCUMENT.uri
- assert response.detail == "401 response at http://circmanager.org/feed/ did not yield an Authentication For OPDS document"
+ assert response.detail == (
+ "401 response at http://circmanager.org/feed/ did not yield an Authentication For OPDS document"
+ )
def test_register_fails_on_401_if_authentication_document_ids_do_not_match(self):
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
auth_document = self._auth_document()
self.http_client.queue_response(
200, content=json.dumps(auth_document),
@@ -1314,11 +1378,14 @@ def test_register_fails_on_401_if_authentication_document_ids_do_not_match(self)
response = self.controller.register(do_get=self.http_client.do_get)
assert response.uri == INVALID_INTEGRATION_DOCUMENT.uri
- assert response.detail == "Authentication For OPDS document guarding http://circmanager.org/feed/ does not match the one at http://circmanager.org/authentication.opds"
+ assert response.detail == (
+ "Authentication For OPDS document guarding http://circmanager.org/feed/ does not match "
+ "the one at http://circmanager.org/authentication.opds"
+ )
def test_register_succeeds_on_401_if_authentication_document_ids_match(self):
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
auth_document = self._auth_document()
self.http_client.queue_response(
200, content=json.dumps(auth_document),
@@ -1339,13 +1406,13 @@ def test_register_succeeds_on_401_if_authentication_document_ids_match(self):
#
# def test_register_fails_on_no_contact_email(self):
# with self.app.test_request_context("/", method="POST"):
- # flask.request.form = ImmutableMultiDict([
+ # request.form = ImmutableMultiDict([
# ("url", "http://circmanager.org/authentication.opds"),
# ])
# response = self.controller.register(do_get=self.http_client.do_get)
# assert response.title == "Invalid or missing configuration contact email address"
- # flask.request.form = ImmutableMultiDict([
+ # request.form = ImmutableMultiDict([
# ("url", "http://circmanager.org/authentication.opds"),
# ("contact", "http://contact-us/")
# ])
@@ -1363,7 +1430,8 @@ def test_register_fails_on_missing_email_in_authentication_document(self):
auth_document = self._auth_document()
# Remove the crucial link.
- auth_document['links'] = [x for x in auth_document['links'] if x['rel'] != rel or not x['href'].startswith("mailto:")]
+ auth_document['links'] = [x for x in auth_document['links']
+ if x['rel'] != rel or not x['href'].startswith("mailto:")]
def _request_fails():
self.http_client.queue_response(
@@ -1371,7 +1439,7 @@ def _request_fails():
url=auth_document['id']
)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = self.registration_form
+ request.form = self.registration_form
response = self.controller.register(do_get=self.http_client.do_get)
assert response.title == error
_request_fails()
@@ -1401,10 +1469,10 @@ def send(self, *args, **kwargs):
)
self.queue_opds_success()
- auth_url = "http://circmanager.org/authentication.opds"
+ auth_url = "http://circmanager.org/authentication.opds" # noqa: F841
# Send a registration request to the registry.
with self.app.test_request_context("/", method="POST"):
- flask.request.form = ImmutableMultiDict([
+ request.form = ImmutableMultiDict([
("url", auth_document['id']),
("contact", "mailto:me@library.org"),
])
@@ -1417,6 +1485,53 @@ def send(self, *args, **kwargs):
assert response.uri == INTEGRATION_ERROR.uri
assert response.detail == "SMTP error while sending email to mailto:help@library.org"
+ def test_registration_fails_if_email_server_unusable(self):
+ """
+ GIVEN: An email integration which is missing or not responding
+ WHEN: A registration is requested
+ THEN: A ProblemDetail of an appropriate type should be returned
+ """
+ # Simulate an SMTP server that is wholly unresponsive
+ class UnresponsiveEmailer(Emailer):
+ def _send_email(*args):
+ raise Exception("message from UnresponsiveEmailer")
+ unresponsive_emailer_kwargs = {
+ "smtp_username": "library",
+ "smtp_password": "library",
+ "smtp_host": "library",
+ "smtp_port": "12345",
+ "from_name": "Test",
+ "from_address": "test@library.tld",
+ "templates": {
+ "address_needs_confirmation": EmailTemplate(
+ "subject", "Hello, %(to_address)s, this is %(from_address)s."
+ )
+ },
+ }
+ self.controller.emailer = UnresponsiveEmailer(**unresponsive_emailer_kwargs)
+
+ # Pretend we are a library with a valid authentication document.
+ auth_document = self._auth_document(None)
+ self.http_client.queue_response(
+ 200, content=json.dumps(auth_document),
+ url=auth_document['id']
+ )
+ self.queue_opds_success()
+
+ # Send a registration request to the registry.
+ with self.app.test_request_context("/", method="POST"):
+ request.form = ImmutableMultiDict([
+ ("url", auth_document['id']),
+ ("contact", "mailto:me@library.org"),
+ ])
+ response = self.controller.register(do_get=self.http_client.do_get)
+
+ # We get back a ProblemDetail the first time
+ # we got a problem sending an email. In this case, it was
+ # trying to contact the library's 'help' address included in the
+ # library's authentication document.
+ assert response.uri == UNABLE_TO_NOTIFY.uri
+
def test_register_success(self):
opds_directory = "application/opds+json;profile=https://librarysimplified.org/rel/profile/directory"
@@ -1434,7 +1549,7 @@ def test_register_success(self):
# Send a registration request to the registry.
random.seed(42)
with self.app.test_request_context("/", method="POST"):
- flask.request.form = ImmutableMultiDict([
+ request.form = ImmutableMultiDict([
("url", auth_url),
("contact", "mailto:me@library.org"),
])
@@ -1445,7 +1560,7 @@ def test_register_success(self):
# The library has been created. Information from its
# authentication document has been added to the database.
library = get_one(self._db, Library, opds_url=opds_url)
- assert library != None
+ assert library is not None
assert library.name == "A Library"
assert library.description == "Description"
assert library.web_url == "http://circmanager.org"
@@ -1469,7 +1584,8 @@ def test_register_success(self):
# A follow-up request was made to the feed mentioned in that
# document.
#
- assert self.http_client.requests == ["http://circmanager.org/authentication.opds", "http://circmanager.org/feed/"]
+ assert self.http_client.requests == ["http://circmanager.org/authentication.opds",
+ "http://circmanager.org/feed/"]
# And the document we queued up was fed into the library
# registry.
@@ -1538,13 +1654,14 @@ def test_register_success(self):
"name": "A Library",
"service_description": "New and improved",
"links": [
- {"rel": "logo", "href": "/logo.png", "type": "image/png" },
- {"rel": "start", "href": "http://circmanager.org/feed/", "type": "application/atom+xml;profile=opds-catalog"},
+ {"rel": "logo", "href": "/logo.png", "type": "image/png"},
+ {"rel": "start", "href": "http://circmanager.org/feed/",
+ "type": "application/atom+xml;profile=opds-catalog"},
{"rel": "help", "href": "mailto:new-help@library.org"},
- {"rel": "http://librarysimplified.org/rel/designated-agent/copyright", "href": "mailto:me@library.org"},
-
+ {"rel": "http://librarysimplified.org/rel/designated-agent/copyright",
+ "href": "mailto:me@library.org"},
],
- "service_area": { "US": "Connecticut" },
+ "service_area": {"US": "Connecticut"},
}
self.http_client.queue_response(
200, content=json.dumps(auth_document), url=auth_document['id']
@@ -1552,7 +1669,11 @@ def test_register_success(self):
self.queue_opds_success()
# We have a new logo as well.
- image_data = b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x01\x03\x00\x00\x00%\xdbV\xca\x00\x00\x00\x06PLTE\xffM\x00\x01\x01\x01\x8e\x1e\xe5\x1b\x00\x00\x00\x01tRNS\xcc\xd24V\xfd\x00\x00\x00\nIDATx\x9cc`\x00\x00\x00\x02\x00\x01H\xaf\xa4q\x00\x00\x00\x00IEND\xaeB`\x82'
+ image_data = (
+ b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x01\x03\x00\x00\x00%\xdbV'
+ b'\xca\x00\x00\x00\x06PLTE\xffM\x00\x01\x01\x01\x8e\x1e\xe5\x1b\x00\x00\x00\x01tRNS\xcc\xd24V'
+ b'\xfd\x00\x00\x00\nIDATx\x9cc`\x00\x00\x00\x02\x00\x01H\xaf\xa4q\x00\x00\x00\x00IEND\xaeB`\x82'
+ )
self.http_client.queue_response(200, content=image_data, media_type="image/png")
# So the library re-registers itself, and gets an updated
@@ -1561,7 +1682,7 @@ def test_register_success(self):
# This time, the library explicitly specifies which stage it
# wants to be in.
with self.app.test_request_context("/", method="POST"):
- flask.request.form = ImmutableMultiDict([
+ request.form = ImmutableMultiDict([
("url", auth_url),
("contact", "mailto:me@library.org"),
("stage", Library.TESTING_STAGE)
@@ -1579,7 +1700,7 @@ def test_register_success(self):
# The library's new data is also in the database.
library = get_one(self._db, Library, opds_url=opds_url)
- assert library != None
+ assert library is not None
assert library.name == "A Library"
assert library.description == "New and improved"
assert library.web_url is None
@@ -1632,8 +1753,11 @@ def test_register_success(self):
# Authentication For OPDS document, and the request to
# get the root OPDS feed, the registry made a
# follow-up request to download the library's logo.
- assert self.http_client.requests == ["http://circmanager.org/authentication.opds", "http://circmanager.org/feed/", "http://circmanager.org/logo.png"]
-
+ assert self.http_client.requests == [
+ "http://circmanager.org/authentication.opds",
+ "http://circmanager.org/feed/",
+ "http://circmanager.org/logo.png"
+ ]
# If we include the old secret in a request and also set
# reset_shared_secret, the registry will generate a new
@@ -1648,7 +1772,7 @@ def test_register_success(self):
]
)
with self.app.test_request_context("/", headers={"Authorization": "Bearer %s" % old_secret}, method="POST"):
- flask.request.form = form_args_with_reset
+ request.form = form_args_with_reset
key = RSA.generate(1024)
auth_document = self._auth_document(key)
self.http_client.queue_response(
@@ -1666,7 +1790,6 @@ def test_register_success(self):
encryptor = PKCS1_OAEP.new(key)
encrypted_secret = base64.b64decode(catalog["metadata"]["shared_secret"])
assert encryptor.decrypt(encrypted_secret).decode("utf8") == library.shared_secret
-
old_secret = library.shared_secret
@@ -1677,7 +1800,7 @@ def test_register_success(self):
(library.shared_secret, form_args_no_reset)
):
with self.app.test_request_context("/", headers={"Authorization": "Bearer %s" % secret}):
- flask.request.form = form
+ request.form = form
key = RSA.generate(1024)
auth_document = self._auth_document(key)
@@ -1690,7 +1813,7 @@ def test_register_success(self):
do_get=self.http_client.do_get
)
- assert response.status_code == 200
+ assert response.status_code == 200
assert library.shared_secret == old_secret
def test_register_with_secret_changes_authentication_url_and_opds_url(self):
@@ -1710,17 +1833,17 @@ def test_register_with_secret_changes_authentication_url_and_opds_url(self):
new_auth_url = auth_document['id']
[new_opds_url] = [
x['href'] for x in auth_document['links']
- if x['rel']=='start'
+ if x['rel'] == 'start'
]
self.http_client.queue_response(
200, content=json.dumps(auth_document), url=new_auth_url
)
self.queue_opds_success()
with self.app.test_request_context("/", method="POST"):
- flask.request.headers = {
+ request.headers = {
"Authorization": "Bearer %s" % secret
}
- flask.request.form = ImmutableMultiDict([
+ request.form = ImmutableMultiDict([
("url", new_auth_url),
])
response = self.controller.register(do_get=self.http_client.do_get)
@@ -1748,6 +1871,7 @@ def html_response(self, status_code, message):
return (status_code, message)
controller = Mock(self.library_registry)
+
def assert_response(resource_id, secret, status_code, message):
"""Invoke the validate() method with the given secret
and verify that html_response is called with the given
@@ -1772,7 +1896,7 @@ def assert_response(resource_id, secret, status_code, message):
secret2 = needs_validation_2.validation.secret
link3, ignore = library.set_hyperlink("rel2", "mailto:3@library.org")
- not_started = link3.resource
+ not_started = link3.resource # noqa: F841
# Simple tests for missing fields or failed lookups.
assert_response(
@@ -1820,6 +1944,7 @@ def assert_response(resource_id, secret, status_code, message):
"This URI has already been validated."
)
+
class TestCoverageController(ControllerTest):
def setup(self):
@@ -1883,7 +2008,7 @@ def test_lookup(self):
# Creating two states with the same name is the simplest way
# to create an ambiguity problem.
- massachussets.external_name="Kansas"
+ massachussets.external_name = "Kansas"
self.parse_to("Kansas", [], ambiguous={"US": ["Kansas"]})
def test_library_eligibility_and_focus(self):
diff --git a/tests/test_decorators.py b/tests/test_decorators.py
new file mode 100644
index 00000000..de89e204
--- /dev/null
+++ b/tests/test_decorators.py
@@ -0,0 +1,258 @@
+import gzip
+import uuid
+from io import BytesIO
+
+import pytest
+from flask import Flask, Blueprint, g, jsonify, make_response
+from flask_sqlalchemy_session import current_session
+
+from decorators import (
+ compressible, has_library, returns_json_or_response_or_problem_detail,
+ returns_problem_detail, uses_location)
+from problem_details import LIBRARY_NOT_FOUND
+from util.problem_detail import ProblemDetail
+from util.geo import Location
+
+PROBLEM_DETAIL_FOR_TEST = ProblemDetail("http://localhost/", 400, "A problem happened.")
+RESPONSE_JSON = {"alpha": "apple", "bravo": "banana"}
+RESPONSE_OBJ_VAL = "This is a Response object."
+
+
+@pytest.fixture
+def app():
+ return Flask(__name__)
+
+
+@pytest.fixture
+def app_with_decorated_routes(app):
+ """Return an app instance augmented with routes that exercise the decorators"""
+ test_blueprint = Blueprint("test_blueprint", __name__, url_prefix="/test")
+
+ @test_blueprint.route("/uses_location")
+ @uses_location
+ def uses_location_testview():
+ location_obj = g.get('location', None)
+ return jsonify({"g.location": str(location_obj)})
+
+ @test_blueprint.route("/has_library/")
+ @has_library
+ def has_library_testview():
+ return jsonify({"g.library": str(g.library)})
+
+ @test_blueprint.route("/returns_problem_detail")
+ @returns_problem_detail
+ def returns_problem_detail_testview():
+ return PROBLEM_DETAIL_FOR_TEST
+
+ @test_blueprint.route("/rjoropd/json")
+ @returns_json_or_response_or_problem_detail
+ def returns_json_testview():
+ return RESPONSE_JSON
+
+ @test_blueprint.route("/rjoropd/response")
+ @returns_json_or_response_or_problem_detail
+ def returns_response_testview():
+ return make_response(RESPONSE_OBJ_VAL)
+
+ @test_blueprint.route("/rjoropd/problem_detail")
+ @returns_json_or_response_or_problem_detail
+ def returns_problemdetail_testview():
+ return PROBLEM_DETAIL_FOR_TEST
+
+ @test_blueprint.route("/compressible")
+ @compressible
+ def returns_compressed_testview():
+ response = make_response(RESPONSE_OBJ_VAL)
+ return response
+
+ @test_blueprint.route("/compressible_4xx")
+ @returns_problem_detail
+ @compressible
+ def returns_uncompressed_4xx_testview():
+ return PROBLEM_DETAIL_FOR_TEST
+
+ @test_blueprint.route("/compressible_already_encoded")
+ @compressible
+ def returns_already_encoded_testview():
+ response = make_response(RESPONSE_OBJ_VAL)
+ response.headers["Content-Encoding"] = "some_encoding"
+ return response
+
+ app.register_blueprint(test_blueprint)
+ yield app
+ del app
+
+
+class TestDecorators:
+ def test_uses_location_from_args(self, app_with_decorated_routes):
+ """
+ GIVEN: A request with a valid _location string in the args
+ WHEN: The uses_location decorator intercepts that request
+ THEN: A corresponding geometry string should be placed in g.location
+ """
+ with app_with_decorated_routes.test_client() as client:
+ client.get("/test/uses_location?_location=40.7128,74.0060")
+ assert isinstance(g.location, Location)
+ assert str(g.location) == 'SRID=4326;POINT(74.006 40.7128)'
+
+ def test_uses_location_from_ip(self, app_with_decorated_routes):
+ """
+ GIVEN: A request with no _location string in the args
+ WHEN: The uses_location decorator intercepts that request
+ THEN: A geometry string derived from the requesting IP should be placed in g.location
+ """
+ with app_with_decorated_routes.test_client() as client:
+ client.get("/test/uses_location", headers={"X-Forwarded-For": "1.1.1.1"})
+ assert isinstance(g.location, Location)
+ assert g.location.ewkt == 'SRID=4326;POINT(145.1833 -37.7)'
+
+ def test_uses_location_bad_input(self, app_with_decorated_routes):
+ """
+ GIVEN: A request with an invalid _location string in the args
+ WHEN: The uses_location decorator intercepts that request
+ THEN: None should be placed in g.location
+ """
+ with app_with_decorated_routes.test_client() as client:
+ client.get("/test/uses_location?_location=BADINPUT")
+ assert g.get('location', None) is None
+
+ @pytest.mark.skip
+ def test_has_library_full_urn(self, app_with_decorated_routes, create_test_library):
+ """
+ GIVEN: A request to a route whose URL pattern includes a parameter
+ which identifies a library that exists in the database, where the
+ value is formatted as 'urn:uuid:' + str(uuid.uuid4()).
+ WHEN: The has_library decorator intercepts that request
+ THEN: A corresponding Library object should be placed in g.library
+ """
+ with app_with_decorated_routes.app_context():
+ test_lib = create_test_library(current_session)
+ with app_with_decorated_routes.test_client() as client:
+ bare_uuid = str(test_lib.internal_urn)[9:]
+ client.get(f"/test/has_library/urn:uuid:{bare_uuid}")
+ assert g.library.internal_urn == test_lib.internal_urn
+ current_session.delete(test_lib)
+ current_session.commit()
+
+ @pytest.mark.skip
+ def test_has_library_bare_uuid(self, app_with_decorated_routes, create_test_library):
+ """
+ GIVEN: A request to a route whose URL pattern includes a parameter
+ which identifies a library that exists in the database, where the
+ value is formatted as just a str(uuid.uuid4()) without leading 'urn:uuid:'.
+ WHEN: The has_library decorator intercepts that request
+ THEN: A corresponding Library object should be placed in g.library
+ """
+ with app_with_decorated_routes.app_context():
+ test_lib = create_test_library(current_session)
+ with app_with_decorated_routes.test_client() as client:
+ client.get(f"/test/has_library/{test_lib.internal_urn}")
+ assert g.library.internal_urn == test_lib.internal_urn
+ current_session.delete(test_lib)
+ current_session.commit()
+
+ @pytest.mark.skip
+ def test_has_library_bad_uuid(self, app_with_decorated_routes):
+ """
+ GIVEN: A request to a route whose URL pattern includes a parameter
+ which is not the internal_urn value of any known Library.
+ WHEN: The has_library decorator intercepts that request
+ THEN: A LIBRARY_NOT_FOUND problem document should be returned
+ """
+ with app_with_decorated_routes.app_context():
+ with app_with_decorated_routes.test_client() as client:
+ response = client.get(f"/test/has_library/{str(uuid.uuid4())}")
+ assert response.status_code == LIBRARY_NOT_FOUND.status_code
+ assert response.json["type"] == LIBRARY_NOT_FOUND.uri
+ assert response.json["title"] == LIBRARY_NOT_FOUND.title
+ assert response.json["status"] == LIBRARY_NOT_FOUND.status_code
+
+ def test_returns_problem_detail(self, app_with_decorated_routes):
+ """
+ GIVEN: A request to a route which returns a ProblemDetail instance
+ WHEN: The returns_problem_detail decorator intercepts that request
+ THEN: The .response of that ProblemDetail object should be returned
+ """
+ with app_with_decorated_routes.test_client() as client:
+ response = client.get("/test/returns_problem_detail")
+ assert response.status_code == PROBLEM_DETAIL_FOR_TEST.status_code
+ assert response.json["type"] == PROBLEM_DETAIL_FOR_TEST.uri
+ assert response.json["title"] == PROBLEM_DETAIL_FOR_TEST.title
+ assert response.json["status"] == PROBLEM_DETAIL_FOR_TEST.status_code
+
+ def test_rjoropd_json(self, app_with_decorated_routes):
+ """
+ GIVEN: A request to a route that returns a Python object
+ WHEN: The returns_json_or_response_or_problem_detail decorator intercepts
+ that request/response
+ THEN: A jsonified version of the object should be available in the response
+ """
+ with app_with_decorated_routes.test_client() as client:
+ response = client.get("/test/rjoropd/json")
+ assert response.json == RESPONSE_JSON
+
+ def test_rjoropd_response(self, app_with_decorated_routes):
+ """
+ GIVEN: A request to a route that returns a Flask Response object
+ WHEN: The returns_json_or_response_or_problem_detail decorator intercepts
+ that request/response
+ THEN: That Response should be passed through to the client as-is
+ """
+ with app_with_decorated_routes.test_client() as client:
+ response = client.get("/test/rjoropd/response")
+ assert response.data.decode('utf-8') == RESPONSE_OBJ_VAL
+
+ def test_rjoropd_problemdetail(self, app_with_decorated_routes):
+ """
+ GIVEN: A request to a route that returns a ProblemDetail object
+ WHEN: The returns_json_or_response_or_problem_detail decorator intercepts
+ that request/response
+ THEN: The ProblemDetail.response should be returned
+ """
+ with app_with_decorated_routes.test_client() as client:
+ response = client.get("/test/rjoropd/problem_detail")
+ assert response.status_code == PROBLEM_DETAIL_FOR_TEST.status_code
+ assert response.json["type"] == PROBLEM_DETAIL_FOR_TEST.uri
+ assert response.json["title"] == PROBLEM_DETAIL_FOR_TEST.title
+ assert response.json["status"] == PROBLEM_DETAIL_FOR_TEST.status_code
+
+ def test_compressible(self, app_with_decorated_routes):
+ """
+ GIVEN: A response with a known payload
+ WHEN: That response is rendered via the compressible decorator
+ THEN: A gzipped version of that response is returned as the endpoint payload
+ """
+ buffer = BytesIO()
+ with gzip.GzipFile(mode='wb', fileobj=buffer) as gzipped:
+ gzipped.write(RESPONSE_OBJ_VAL.encode("utf8"))
+ expected = buffer.getvalue()
+
+ with app_with_decorated_routes.test_client() as client:
+ response = client.get("/test/compressible", headers={'Accept-Encoding': 'gzip'})
+ assert response.headers['Content-Encoding'] == 'gzip'
+ assert response.headers['Vary'] == 'Accept-Encoding'
+ assert int(response.headers['Content-Length']) == len(expected)
+ assert response.data == expected
+
+ def test_compressible_non_2xx_response(self, app_with_decorated_routes):
+ """
+ GIVEN: A non-2xx response from a view wrapped by @compressible
+ WHEN: The view function is called
+ THEN: The response should not be compressed
+ """
+ with app_with_decorated_routes.test_client() as client:
+ response = client.get("/test/compressible_4xx", headers={'Accept-Encoding': 'gzip'})
+ assert response.status_code == 400
+ assert 'Content-Encoding' not in response.headers.keys()
+ assert 'Vary' not in response.headers.keys()
+
+ def test_compressible_already_encoded(self, app_with_decorated_routes):
+ """
+ GIVEN: A view function which adds a 'Content-Encoding' header to its response
+ WHEN: The view function is called, wrapped by @compressible
+ THEN: The response should not be compressed
+ """
+ with app_with_decorated_routes.test_client() as client:
+ response = client.get("/test/compressible_already_encoded", headers={'Accept-Encoding': 'gzip'})
+ assert 199 < response.status_code < 300
+ assert 'Vary' not in response.headers.keys()
diff --git a/tests/test_emailer.py b/tests/test_emailer.py
index 814cd86b..ddf140a2 100644
--- a/tests/test_emailer.py
+++ b/tests/test_emailer.py
@@ -3,7 +3,7 @@
from . import DatabaseTest
from email.mime.text import MIMEText
-from config import CannotLoadConfiguration
+from config import CannotLoadConfiguration, CannotSendEmail
from emailer import (
Emailer,
EmailTemplate,
@@ -19,9 +19,7 @@ def test_body(self):
"A %(color)s subject",
"The subject is %(color)s but the body is %(number)d"
)
- body = template.body("me@example.com", "you@example.com",
- color="red", number=22
- )
+ body = template.body("me@example.com", "you@example.com", color="red", number=22)
# We always generate a MIME multipart message because
# that's how we handle non-ASCII characters.
@@ -43,7 +41,6 @@ def test_body(self):
):
assert expect in body
-
def test_unicode_quoted_printable(self):
# Create an email message that includes Unicode characters in
# its subject and body.
@@ -83,10 +80,18 @@ def record(*args, **kwargs):
class MockEmailer(Emailer):
"""Store outgoing emails in a list."""
emails = []
+
def _send_email(self, to_address, body, smtp):
self.emails.append((to_address, body, smtp))
+class MockBrokenEmailer(Emailer):
+ """Raise a generic Exception when _send_email() is called"""
+
+ def _send_email(*args):
+ raise Exception("message from MockBrokenEmailer")
+
+
class TestEmailer(DatabaseTest):
def _integration(self):
@@ -118,7 +123,7 @@ def test__sitewide_integration(self):
# If there are multiple integrations with goal=Emailer.GOAL, no
# sitewide configuration can be determined.
- duplicate = self._integration()
+ self._integration()
with pytest.raises(CannotLoadConfiguration) as exc:
m(self._db)
assert 'Multiple email integrations are configured' in str(exc.value)
@@ -170,52 +175,33 @@ def test_constructor(self):
m = Emailer
with pytest.raises(CannotLoadConfiguration) as exc:
m(**args)
- assert "No SMTP username specified" in str(exc.value)
+ assert "Emailer instantiated with missing params" in str(exc.value)
+ assert 'smtp_username' in str(exc.value)
+ assert 'smtp_password' in str(exc.value)
+ assert 'smtp_host' in str(exc.value)
+ assert 'smtp_port' in str(exc.value)
+ assert 'from_name' in str(exc.value)
+ assert 'from_address' in str(exc.value)
args['smtp_username'] = 'user'
-
- with pytest.raises(CannotLoadConfiguration) as exc:
- m(**args)
- assert "No SMTP password specified" in str(exc.value)
-
args['smtp_password'] = 'password'
-
- with pytest.raises(CannotLoadConfiguration) as exc:
- m(**args)
- assert "No SMTP host specified" in str(exc.value)
-
args['smtp_host'] = 'host'
-
- with pytest.raises(CannotLoadConfiguration) as exc:
- m(**args)
- assert "No SMTP port specified" in str(exc.value)
-
args['smtp_port'] = 'port'
-
- with pytest.raises(CannotLoadConfiguration) as exc:
- m(**args)
- assert "No From: name specified" in str(exc.value)
-
args['from_name'] = 'Email Sender'
-
- with pytest.raises(CannotLoadConfiguration) as exc:
- m(**args)
- assert "No From: address specified" in str(exc.value)
-
args['from_address'] = 'from@library.org'
# With all the arguments specified, it works.
- emailer = m(**args)
+ m(**args)
# If one of the templates can't be used, it doesn't work.
args['templates']['key'] = EmailTemplate("%(nope)s", "email body")
with pytest.raises(CannotLoadConfiguration) as exc:
m(**args)
- assert r"Template '%(nope)s'/'email body' contains unrecognized key: KeyError('nope')" in str(exc.value)
+ assert r"Template '%(nope)s'/'email body' contains unrecognized key: 'nope'" in str(exc.value)
def test_templates(self):
"""Test the emails generated by the default templates."""
- integration = self._integration()
+ self._integration()
emailer = Emailer.from_sitewide_integration(self._db)
# Start with arguments common to both email templates.
@@ -235,16 +221,21 @@ def test_templates(self):
for phrase in [
"From: me@registry",
"To: you@library",
- "This address designated as the support address for My Public".replace(" ", "_"), # Part of the encoding process
+ "This address designated as the support address for My Public".replace(" ", "_"), # Part of encoding
]:
assert phrase in body
# Verify that the body was set correctly.
- expect = """This email address, you@library, has been registered with the Library Simplified library registry as the support address for the library My Public Library (https://library/).
-
-If this is obviously wrong (for instance, you don't work at a public library), please accept our apologies and contact the Library Simplified support address at me@registry -- something has gone wrong.
-
-If you do work at a public library, but you're not sure what this means, please speak to a technical point of contact at your library, or contact the Library Simplified support address at me@registry."""
+ expect = (
+ "This email address, you@library, has been registered with the Library Simplified library registry "
+ "as the support address for the library My Public Library (https://library/)."
+ "\n\n"
+ "If this is obviously wrong (for instance, you don't work at a public library), please accept our "
+ "apologies and contact the Library Simplified support address at me@registry -- something has gone wrong."
+ "\n\n"
+ "If you do work at a public library, but you're not sure what this means, please speak to a technical "
+ "point of contact at your library, or contact the Library Simplified support address at me@registry."
+ )
text_part = MIMEText(expect, 'plain', 'utf-8')
assert text_part.get_payload() in body
@@ -256,16 +247,6 @@ def test_templates(self):
"me@registry", "you@library", **args
)
- # The address confirmation template is the address designation
- # template with a couple extra paragraphs and a different
- # subject line.
- extra = """If you do know what this means, you should also know that you
-'re not quite done. We need to confirm that you actually meant to use this email address for this purpose. If everything looks right, please visit this link:
-
-http://registry/confirm
-
-The link will expire in about a day. If the link expires, just re-register your library with the library registry, and a fresh confirmation email like this will be sent out."""
-
# Verify the subject line
assert "Confirm_the_" in body2
@@ -273,7 +254,6 @@ def test_templates(self):
# to check the whole thing because expect2 parses into a
# slightly different Message object than is generated by
# Emailer.)
- expect2 = expect + "\n\n" + extra
for phrase in [
"\nhttp://registry/confirm\n",
"The link will expire"
@@ -302,16 +282,28 @@ def test_send(self):
for phrase in [
"From: Me ",
"To: you@library",
- "subject Value".replace(" ", "_"), # Part of the encoding process.
+ "subject Value".replace(" ", "_"), # Part of the encoding process.
"Hello, you@library, this is me@registry."
]:
print(phrase)
assert phrase in body
assert smtp == mock_smtp
+ def test_send_failure(self):
+ """
+ GIVEN: An Emailer whose _send_email method raises an Exception
+ WHEN: The send() method catches that exception
+ THEN: A more specific exception should be raised
+ """
+ self._integration()
+ emailer = MockBrokenEmailer.from_sitewide_integration(self._db)
+ emailer.templates['some_email'] = EmailTemplate("subject", "Hello.")
+ with pytest.raises(CannotSendEmail):
+ emailer.send("some_email", "me@domain.tld")
+
def test__send_email(self):
"""Verify that send_email calls certain methods on smtplib.SMTP."""
- integration = self._integration()
+ self._integration()
emailer = Emailer.from_sitewide_integration(self._db)
mock = MockSMTP()
emailer._send_email("you@library", "email body", mock)
diff --git a/tests/test_geometry_loader.py b/tests/test_geometry_loader.py
index 62f808db..1467905b 100644
--- a/tests/test_geometry_loader.py
+++ b/tests/test_geometry_loader.py
@@ -1,9 +1,7 @@
from io import StringIO
from sqlalchemy import func
-from geoalchemy2 import Geography
from model import (
- get_one,
get_one_or_create,
Place,
PlaceAlias,
@@ -24,8 +22,8 @@ def setup(self):
def test_load(self):
# Load a place identified by a GeoJSON Polygon.
- metadata = '{"parent_id": null, "name": "77977", "id": "77977", "type": "postal_code", "aliases": [{"name": "The 977", "language": "eng"}]}'
- geography = '{"type": "Polygon", "coordinates": [[[-96.840066, 28.683039], [-96.830637, 28.690131], [-96.835048, 28.693599], [-96.833515, 28.694926], [-96.82657, 28.699584], [-96.822495, 28.695826], [-96.821248, 28.696391], [-96.814249, 28.700983], [-96.772337, 28.722765], [-96.768804, 28.725363], [-96.768564, 28.725046], [-96.767246, 28.723276], [-96.765295, 28.722084], [-96.764568, 28.720456], [-96.76254, 28.718483], [-96.763087, 28.717521], [-96.761814, 28.716488], [-96.761088, 28.713623], [-96.762231, 28.712798], [-96.75967, 28.709812], [-96.781093, 28.677548], [-96.784803, 28.675363], [-96.793788, 28.669546], [-96.791527, 28.667603], [-96.808567, 28.678507], [-96.81505, 28.682946], [-96.820191, 28.684517], [-96.827178, 28.679867], [-96.828626, 28.681719], [-96.831309, 28.680451], [-96.83565, 28.677724], [-96.840066, 28.683039]]]}'
+ metadata = '{"parent_id": null, "name": "77977", "id": "77977", "type": "postal_code", "aliases": [{"name": "The 977", "language": "eng"}]}' # noqa: E501
+ geography = '{"type": "Polygon", "coordinates": [[[-96.840066, 28.683039], [-96.830637, 28.690131], [-96.835048, 28.693599], [-96.833515, 28.694926], [-96.82657, 28.699584], [-96.822495, 28.695826], [-96.821248, 28.696391], [-96.814249, 28.700983], [-96.772337, 28.722765], [-96.768804, 28.725363], [-96.768564, 28.725046], [-96.767246, 28.723276], [-96.765295, 28.722084], [-96.764568, 28.720456], [-96.76254, 28.718483], [-96.763087, 28.717521], [-96.761814, 28.716488], [-96.761088, 28.713623], [-96.762231, 28.712798], [-96.75967, 28.709812], [-96.781093, 28.677548], [-96.784803, 28.675363], [-96.793788, 28.669546], [-96.791527, 28.667603], [-96.808567, 28.678507], [-96.81505, 28.682946], [-96.820191, 28.684517], [-96.827178, 28.679867], [-96.828626, 28.681719], [-96.831309, 28.680451], [-96.83565, 28.677724], [-96.840066, 28.683039]]]}' # noqa: E501
texas_zip, is_new = self.loader.load(metadata, geography)
assert is_new is True
assert texas_zip.external_id == "77977"
@@ -38,7 +36,7 @@ def test_load(self):
assert alias.language == "eng"
# Load another place identified by a GeoJSON Point.
- metadata = '{"parent_id": null, "name": "New York", "type": "state", "abbreviated_name": "NY", "id": "NY", "full_name": "New York", "aliases": [{"name": "New York State", "language": "eng"}]}'
+ metadata = '{"parent_id": null, "name": "New York", "type": "state", "abbreviated_name": "NY", "id": "NY", "full_name": "New York", "aliases": [{"name": "New York State", "language": "eng"}]}' # noqa: E501
geography = '{"type": "Point", "coordinates": [-75, 43]}'
new_york, is_new = self.loader.load(metadata, geography)
assert new_york.abbreviated_name == "NY"
@@ -81,8 +79,7 @@ def test_load_ndjson(self):
)
old_us_geography = old_us.geometry
- # Load a small NDJSON "file" containing information about
- # three places.
+ # Load a small NDJSON "file" containing information about three places.
test_ndjson = """{"parent_id": null, "name": "United States", "aliases": [{"name" : "The Good Old U. S. of A.", "language": "eng"}], "type": "nation", "abbreviated_name": "US", "id": "US"}
{"type": "Point", "coordinates": [-159.459551, 54.948652]}
{"parent_id": "US", "name": "Alabama", "aliases": [], "type": "state", "abbreviated_name": "AL", "id": "01"}
diff --git a/tests/test_model.py b/tests/test_model.py
index 25afada8..f0e1a2d0 100644
--- a/tests/test_model.py
+++ b/tests/test_model.py
@@ -1,40 +1,20 @@
-from sqlalchemy import func
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm.exc import MultipleResultsFound
-import base64
import datetime
import json
-import operator
-import random
import pytest
+from sqlalchemy import func
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm.exc import MultipleResultsFound
from config import Configuration
from emailer import Emailer
-from model import (
- create,
- get_one,
- get_one_or_create,
- Admin,
- Audience,
- CollectionSummary,
- ConfigurationSetting,
- DelegatedPatronIdentifier,
- ExternalIntegration,
- Hyperlink,
- Library,
- LibraryAlias,
- Place,
- PlaceAlias,
- Validation,
-)
-from util import (
- GeometryUtility
-)
-
-from . import (
- DatabaseTest,
-)
+from model import (Admin, Audience, CollectionSummary, ConfigurationSetting,
+ DelegatedPatronIdentifier, ExternalIntegration, Hyperlink,
+ Library, LibraryAlias, Place, PlaceAlias, Validation,
+ create, get_one_or_create)
+from util import GeometryUtility
+
+from . import DatabaseTest
class TestPlace(DatabaseTest):
@@ -82,11 +62,14 @@ def test_creation(self):
lake_placid.geometry, Place.geometry
)
places = self._db.query(Place).filter(
- Place.type==Place.STATE).order_by(distance).add_columns(distance)
+ Place.type == Place.STATE).order_by(distance).add_columns(distance)
# We can find the distance in kilometers between the 'Lake
# Placid' point and the points representing the other states.
- assert [(x[0].external_name, int(x[1]/1000)) for x in places] == [("New York", 172), ("Connecticut", 285), ("New Mexico", 2993)]
+ assert [
+ (x[0].external_name, int(x[1]/1000))
+ for x in places
+ ] == [("New York", 172), ("Connecticut", 285), ("New Mexico", 2993)]
def test_aliases(self):
new_york, is_new = get_one_or_create(
@@ -198,11 +181,11 @@ def test_human_friendly_name(self):
type=Place.STATE, parent=nation)
assert "Alabama" == state.human_friendly_name
- city = self._place(external_name="Montgomery", type=Place.CITY,
+ city = self._place(external_name="Montgomery", type=Place.CITY,
parent=state)
assert "Montgomery, AL" == city.human_friendly_name
- county = self._place(external_name="Montgomery", type=Place.COUNTY,
+ county = self._place(external_name="Montgomery", type=Place.COUNTY,
parent=state)
assert "Montgomery County, AL" == county.human_friendly_name
@@ -218,7 +201,7 @@ def test_human_friendly_name(self):
# 'everywhere' is not a distinct place with a well-known name.
everywhere = self._place(type=Place.EVERYWHERE)
- assert None == everywhere.human_friendly_name
+ assert everywhere.human_friendly_name is None
def test_lookup_by_name(self):
@@ -236,7 +219,8 @@ def test_lookup_by_name(self):
# To get Santa Barbara County, we have to refer to
# "Santa Barbara County"
assert m(self._db, "Santa Barbara County").all() == [sb_county]
-
+
+ @pytest.mark.skip(reason="docker related failure for uszipcode opening a filehandle")
def test_lookup_inside(self):
us = self.crude_us
zip_10018 = self.zip_10018
@@ -244,7 +228,6 @@ def test_lookup_inside(self):
new_york = self.new_york_state
connecticut = self.connecticut_state
manhattan_ks = self.manhattan_ks
- kansas = manhattan_ks.parent
kings_county = self.crude_kings_county
zip_12601 = self.zip_12601
@@ -342,6 +325,7 @@ def lookup_both_ways(parent, name, expect):
assert zip_10018.lookup_inside("New York", using_overlap=True) == nyc
assert zip_10018.lookup_inside("New York", using_overlap=False) is None
+ @pytest.mark.skip(reason="docker related failure for uszipcode opening a filehandle")
def test_lookup_one_through_external_source(self):
# We're going to find the approximate location of Poughkeepsie
# even though the database doesn't have a Place named
@@ -413,236 +397,6 @@ def test_served_by(self):
class TestLibrary(DatabaseTest):
- def test_timestamp(self):
- """Timestamp gets automatically set on database commit."""
- nypl = self._library("New York Public Library")
- first_modified = nypl.timestamp
- now = datetime.datetime.utcnow()
- self._db.commit()
- assert (now-first_modified).seconds < 2
-
- nypl.opds_url = "http://library/"
- self._db.commit()
- assert nypl.timestamp > first_modified
-
- def test_short_name(self):
- lib = self._library("A Library")
- lib.short_name = 'abcd'
- assert lib.short_name == "ABCD"
- try:
- lib.short_name = 'ab|cd'
- raise Error("Expected exception not raised.")
- except ValueError as e:
- assert str(e) == 'Short name cannot contain the pipe character.'
-
- def test_for_short_name(self):
- assert Library.for_short_name(self._db, 'ABCD') is None
- lib = self._library("A Library")
- lib.short_name = 'ABCD'
- assert Library.for_short_name(self._db, 'ABCD') == lib
-
- def test_for_urn(self):
- assert Library.for_urn(self._db, 'ABCD') is None
- lib = self._library()
- assert Library.for_urn(self._db, lib.internal_urn) == lib
-
- def test_random_short_name(self):
- # First, try with no duplicate check.
- random.seed(42)
- name = Library.random_short_name()
-
- expect = 'UDAXIH'
- assert expect == name
-
- # Reset the random seed so the same name will be generated again.
- random.seed(42)
- # Create a duplicate_check implementation that claims QAHFTR
- # has already been used.
- def already_used(name):
- return name == expect
- name = Library.random_short_name(duplicate_check=already_used)
-
- # random_short_name now generates `expect`, but it's a
- # duplicate, so it tries again and generates a new string
- # which passes the already_used test.
-
- expect_next = "HEXDVX"
- assert expect_next == name
-
- # To avoid an infinite loop, we will stop trying and raise an
- # exception after a certain number of attempts (the default is
- # 20).
- def theyre_all_duplicates(name):
- return True
- with pytest.raises(ValueError) as exc:
- Library.random_short_name(duplicate_check=theyre_all_duplicates)
- assert "Could not generate random short name after 20 attempts!" in str(exc.value)
-
- def test_set_library_stage(self):
- lib = self._library()
-
- # We can't change library_stage because only the registry can
- # take a library from production to non-production.
- def crash():
- lib.library_stage = Library.TESTING_STAGE
- with pytest.raises(ValueError) as exc:
- crash()
- assert "This library is already in production" in str(exc.value)
-
- # Have the registry take the library out of production.
- lib.registry_stage = Library.CANCELLED_STAGE
- assert lib.in_production is False
-
- # Now we can change the library stage however we want.
- lib.library_stage = Library.TESTING_STAGE
- lib.library_stage = Library.CANCELLED_STAGE
- lib.library_stage = Library.PRODUCTION_STAGE
-
- def test_in_production(self):
- lib = self._library()
-
- # The testing code creates a library that starts out in
- # production.
- assert lib.library_stage == Library.PRODUCTION_STAGE
- assert lib.registry_stage == Library.PRODUCTION_STAGE
- assert lib.in_production is True
-
- # If either library_stage or registry stage is not
- # PRODUCTION_STAGE, we are not in production.
- lib.registry_stage = Library.CANCELLED_STAGE
- assert lib.in_production is False
-
- lib.library_stage = Library.CANCELLED_STAGE
- assert lib.in_production is False
-
- lib.registry_stage = Library.PRODUCTION_STAGE
- assert lib.in_production is False
-
- def test_number_of_patrons(self):
- production_library = self._library()
- assert production_library.number_of_patrons == 0
- identifier1, is_new = DelegatedPatronIdentifier.get_one_or_create(
- self._db, production_library, self._str, DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID,
- None
- )
- assert production_library.number_of_patrons == 1
- # Identifiers that aren't Adobe Account IDs don't count towards the total.
- identifier2, is_new = DelegatedPatronIdentifier.get_one_or_create(
- self._db, production_library, self._str, "abc", None
- )
- assert production_library.number_of_patrons == 1
- # Identifiers can't be assigned to libraries that aren't in production.
- testing_library = self._library(library_stage=Library.TESTING_STAGE)
- assert testing_library.number_of_patrons == 0
- identifier3, is_new = DelegatedPatronIdentifier.get_one_or_create(
- self._db, testing_library, self._str, DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID,
- None
- )
- assert testing_library.number_of_patrons == 0
-
- def test__feed_restriction(self):
- """Test the _feed_restriction helper method."""
-
- def feed(production=True):
- """Find only libraries that belong in a certain feed."""
- qu = self._db.query(Library)
- qu = qu.filter(Library._feed_restriction(production))
- return qu.all()
-
- # This library starts out in production.
- library = self._library()
-
- # It shows up in both the production and testing feeds.
- for production in (True, False):
- assert feed(production) == [library]
-
- # Now one party thinks the library is in the testing stage.
- library.registry_stage = Library.TESTING_STAGE
-
- # It shows up in the testing feed but not the production feed.
- assert feed(True) == []
- assert feed(False) == [library]
-
- library.library_stage = Library.TESTING_STAGE
- library.registry_stage = Library.PRODUCTION_STAGE
- assert feed(True) == []
- assert feed(False) == [library]
-
- # Now on party thinks the library is in the cancelled stage,
- # and it will not show up in eithre feed.
- library.library_stage = Library.CANCELLED_STAGE
- for production in (True, False):
- assert feed(production) == []
-
- def test_set_hyperlink(self):
- library = self._library()
-
- with pytest.raises(ValueError) as exc:
- library.set_hyperlink("rel")
- assert "No Hyperlink hrefs were specified" in str(exc.value)
-
- with pytest.raises(ValueError) as exc:
- library.set_hyperlink(None, ["href"])
- assert "No link relation was specified" in str(exc.value)
-
- link, is_modified = library.set_hyperlink("rel", "href1", "href2")
- assert link.rel == "rel"
- assert link.href == "href1"
- assert is_modified is True
-
- # Calling set_hyperlink again does not modify the link
- # so long as the old href is still a possibility.
- link2, is_modified = library.set_hyperlink("rel", "href2", "href1")
- assert link2 == link
- assert link2.rel == "rel"
- assert link2.href == "href1"
- assert is_modified is False
-
- # If there is no way to keep a Hyperlink's href intact,
- # set_hyperlink will modify it.
- link3, is_modified = library.set_hyperlink("rel", "href2", "href3")
- assert link3 == link
- assert link3.rel == "rel"
- assert link3.href == "href2"
- assert is_modified is True
-
- # Under no circumstances will two hyperlinks for the same rel be
- # created for a given library.
- assert library.hyperlinks == [link3]
-
- # However, a library can have multiple hyperlinks to the same
- # Resource using different rels.
- link4, modified = library.set_hyperlink("rel2", "href2")
- assert link4.resource == link3.resource
- assert modified is True
-
- # And two libraries can link to the same Resource using the same
- # rel.
- library2 = self._library()
- link5, modified = library2.set_hyperlink("rel2", "href2")
- assert modified is True
- assert link5.library == library2
- assert link5.resource == link4.resource
-
- def test_get_hyperlink(self):
- library = self._library()
- link1, is_modified = library.set_hyperlink("contact_email", "contact_href")
- link2, is_modified = library.set_hyperlink("help_email", "help_href")
-
- contact_link = Library.get_hyperlink(library, "contact_email")
- assert link1 == contact_link
-
- help_link = Library.get_hyperlink(library, "help_email")
- assert help_link == link2
-
- def test_library_service_area(self):
- zip = self.zip_10018
-
- nypl = self._library("New York Public Library", eligibility_areas=[zip])
- [service_area] = nypl.service_areas
- assert service_area.place == zip
- assert service_area.library == nypl
-
def test_service_area_name(self):
# Gather a few focus areas; the details don't matter.
@@ -658,7 +412,7 @@ def test_service_area_name(self):
"Internet Archive", eligibility_areas=[everywhere],
focus_areas=[everywhere]
)
- assert None == library.service_area_name
+ assert library.service_area_name is None
# A library with a single eligibility area has a
# straightforward name.
@@ -697,356 +451,7 @@ def test_service_area_name(self):
"test library", eligibility_areas=[everywhere, new_york, zip],
focus_areas=[nyc, zip, everywhere]
)
- assert None == library.service_area_name
-
- def test_relevant_audience(self):
- research = self._library(
- "NYU Library", eligibility_areas=[self.new_york_city], focus_areas=[self.new_york_city],
- audiences=[Audience.RESEARCH],
- )
- public = self._library(
- "New York Public Library", eligibility_areas=[self.new_york_city], focus_areas=[self.new_york_city],
- audiences=[Audience.PUBLIC],
- )
- education = self._library(
- "School", eligibility_areas=[self.new_york_city], focus_areas=[self.new_york_city],
- audiences=[Audience.EDUCATIONAL_PRIMARY, Audience.EDUCATIONAL_SECONDARY],
- )
- self._db.flush()
-
- [(lib, s)] = Library.relevant(self._db, (40.65, -73.94), 'eng', audiences=[Audience.PUBLIC]).most_common()
- assert lib == public
-
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (40.65, -73.94), 'eng', audiences=[Audience.RESEARCH]).most_common()
- assert lib1 == research
- assert lib2 == public
-
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (40.65, -73.94), 'eng', audiences=[Audience.EDUCATIONAL_PRIMARY]).most_common()
- assert lib1 == education
- assert lib2 == public
-
- def test_relevant_collection_size(self):
- small = self._library(
- "Small Library", eligibility_areas=[self.new_york_city], focus_areas=[self.new_york_city]
- )
- CollectionSummary.set(small, "eng", 10)
- large = self._library(
- "Large Library", eligibility_areas=[self.new_york_city], focus_areas=[self.new_york_city]
- )
- CollectionSummary.set(large, "eng", 100000)
- empty = self._library(
- "Empty Library", eligibility_areas=[self.new_york_city], focus_areas=[self.new_york_city]
- )
- CollectionSummary.set(empty, "eng", 0)
- unknown = self._library(
- "Unknown Library", eligibility_areas=[self.new_york_city], focus_areas=[self.new_york_city]
- )
- self._db.flush()
-
- [(lib1, s1), (lib2, s2), (lib3, s3)] = Library.relevant(self._db, (40.65, -73.94), 'eng').most_common()
- assert lib1 == large
- assert lib2 == small
- assert lib3 == unknown
- # Empty isn't included because we're sure it has no books in English.
-
- def test_relevant_eligibility_area(self):
- # Create two libraries. One serves New York City, and one serves
- # the entire state of Connecticut. They have the same focus area
- # so this only tests eligibility area.
- nypl = self._library(
- "New York Public Library", eligibility_areas=[self.new_york_city], focus_areas=[self.new_york_city, self.connecticut_state],
- )
- ct_state = self._library(
- "Connecticut State Library", eligibility_areas=[self.connecticut_state], focus_areas=[self.new_york_city, self.connecticut_state],
- )
- self._db.flush()
-
- # From this point in Brooklyn, NYPL is the closest library.
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (40.65, -73.94), 'eng').most_common()
- assert lib1 == nypl
- assert lib2 == ct_state
-
- # From this point in Connecticut, CT State is the closest.
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (41.3, -73.3), 'eng').most_common()
- assert lib1 == ct_state
- assert lib2 == nypl
-
- # From this point in New Jersey, NYPL is closest.
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (40.72, -74.47), 'eng').most_common()
- assert lib1 == nypl
- assert lib2 == ct_state
-
- # From this point in the Indian Ocean, both libraries
- # are so far away they're below the score threshold.
- assert list(Library.relevant(self._db, (-15, 91), 'eng').most_common()) == []
-
- def test_relevant_focus_area(self):
- # Create two libraries. One serves New York City, and one serves
- # the entire state of Connecticut. They have the same eligibility
- # area, so this only tests focus area.
- nypl = self._library(
- "New York Public Library", focus_areas=[self.new_york_city], eligibility_areas=[self.new_york_city, self.connecticut_state]
- )
- ct_state = self._library(
- "Connecticut State Library", focus_areas=[self.connecticut_state], eligibility_areas=[self.new_york_city, self.connecticut_state]
- )
- self._db.flush()
-
- # From this point in Brooklyn, NYPL is the closest library.
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (40.65, -73.94), 'eng').most_common()
- assert lib1 == nypl
- assert lib2 == ct_state
-
- # From this point in Connecticut, CT State is the closest.
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (41.3, -73.3), 'eng').most_common()
- assert lib1 == ct_state
- assert lib2 == nypl
-
- # From this point in New Jersey, NYPL is closest.
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (40.72, -74.47), 'eng').most_common()
- assert lib1 == nypl
- assert lib2 == ct_state
-
- # From this point in the Indian Ocean, both libraries
- # are so far away they're below the score threshold.
- assert list(Library.relevant(self._db, (-15, 91), 'eng').most_common()) == []
-
- def test_relevant_focus_area_size(self):
- # This library serves NYC.
- nypl = self._library(
- "New York Public Library", focus_areas=[self.new_york_city], eligibility_areas=[self.new_york_state]
- )
- # This library serves New York state.
- ny_state = self._library(
- "New York State Library", focus_areas=[self.new_york_state], eligibility_areas=[self.new_york_state]
- )
- self._db.flush()
-
- # This point in Brooklyn is in both libraries' focus areas,
- # but NYPL has a smaller focus area so it wins.
- [(lib1, s1), (lib2, s2)] = Library.relevant(self._db, (40.65, -73.94), 'eng').most_common()
- assert lib1 == nypl
- assert lib2 == ny_state
-
- def test_relevant_library_with_no_service_areas(self):
- # Make sure a library with no service areas doesn't crash the query.
-
- # This library serves NYC.
- nypl = self._library(
- "New York Public Library", focus_areas=[self.new_york_city], eligibility_areas=[self.new_york_state]
- )
- # This library has no service areas.
- no_service_area = self._library(
- "Nowhere Library"
- )
-
- self._db.flush()
-
- [(lib, s)] = Library.relevant(self._db, (40.65, -73.94), 'eng').most_common()
- assert lib == nypl
-
- def test_relevant_all_factors(self):
- # This library serves the general public in NY state, with a focus on Manhattan.
- nypl = self._library(
- "New York Public Library", focus_areas=[self.crude_new_york_county],
- eligibility_areas=[self.new_york_state], audiences=[Audience.PUBLIC],
- )
- CollectionSummary.set(nypl, "eng", 150000)
- CollectionSummary.set(nypl, "spa", 20000)
- CollectionSummary.set(nypl, "rus", 5000)
-
- # This library serves the general public in NY state, with a focus on Brooklyn.
- bpl = self._library(
- "Brooklyn Public Library", focus_areas=[self.crude_kings_county],
- eligibility_areas=[self.new_york_state], audiences=[Audience.PUBLIC],
- )
- CollectionSummary.set(bpl, "eng", 75000)
- CollectionSummary.set(bpl, "spa", 10000)
-
- # This library serves the general public in Albany.
- albany = self._library(
- "Albany Public Library", focus_areas=[self.crude_albany],
- eligibility_areas=[self.crude_albany], audiences=[Audience.PUBLIC],
- )
- CollectionSummary.set(albany, "eng", 50000)
- CollectionSummary.set(albany, "spa", 5000)
-
- # This library serves NYU students.
- nyu_lib = self._library(
- "NYU Library", focus_areas=[self.new_york_city],
- eligibility_areas=[self.new_york_city], audiences=[Audience.EDUCATIONAL_SECONDARY],
- )
- CollectionSummary.set(nyu_lib, "eng", 100000)
-
- # These libraries serves the general public, but mostly academics.
- nyu_press = self._library(
- "NYU Press", focus_areas=[self.new_york_city],
- eligibility_areas=[Place.everywhere(self._db)], audiences=[Audience.RESEARCH, Audience.PUBLIC],
- )
- CollectionSummary.set(nyu_press, "eng", 40)
-
- unm = self._library(
- "UNM Press", focus_areas=[self.kansas_state],
- eligibility_areas=[Place.everywhere(self._db)], audiences=[Audience.RESEARCH, Audience.PUBLIC],
- )
- CollectionSummary.set(unm, "eng", 60)
- CollectionSummary.set(unm, "spa", 10)
-
- # This library serves people with print disabilities in the US.
- bard = self._library(
- "BARD", focus_areas=[self.crude_us],
- eligibility_areas=[self.crude_us], audiences=[Audience.PRINT_DISABILITY],
- )
- CollectionSummary.set(bard, "eng", 100000)
-
- # This library serves the general public everywhere.
- internet_archive = self._library(
- "Internet Archive", focus_areas=[Place.everywhere(self._db)],
- eligibility_areas=[Place.everywhere(self._db)], audiences=[Audience.PUBLIC],
- )
- CollectionSummary.set(internet_archive, "eng", 10000000)
- CollectionSummary.set(internet_archive, "spa", 1000)
- CollectionSummary.set(internet_archive, "rus", 1000)
-
- self._db.flush()
-
- # In Manhattan.
- libraries = Library.relevant(self._db, (40.75, -73.98), "eng").most_common()
- assert len(libraries) == 4
- assert [l[0] for l in libraries] == [nypl, bpl, internet_archive, nyu_press]
-
-
- # In Brooklyn.
- libraries = Library.relevant(self._db, (40.65, -73.94), "eng").most_common()
- assert len(libraries) == 4
- assert [l[0] for l in libraries] == [bpl, nypl, internet_archive, nyu_press]
-
- # In Queens.
- libraries = Library.relevant(self._db, (40.76, -73.91), "eng").most_common()
- assert len(libraries) == 4
- assert [l[0] for l in libraries] == [nypl, bpl, internet_archive, nyu_press]
-
- # In Albany.
- libraries = Library.relevant(self._db, (42.66, -73.77), "eng").most_common()
- assert len(libraries) == 5
- assert [l[0] for l in libraries] == [albany, nypl, bpl, internet_archive, nyu_press]
-
-
- # In Syracuse (200km west of Albany).
- libraries = Library.relevant(self._db, (43.06, -76.15), "eng").most_common()
- assert len(libraries) == 4
- assert [l[0] for l in libraries] == [nypl, bpl, internet_archive, nyu_press]
-
- # In New Jersey.
- libraries = Library.relevant(self._db, (40.79, -74.43), "eng").most_common()
- assert len(libraries) == 4
- assert [l[0] for l in libraries] == [nypl, bpl, internet_archive, nyu_press]
-
- # In Las Cruces, NM. Internet Archive is first at the moment
- # due to its large collection, but maybe it would be better if UNM was.
- libraries = Library.relevant(self._db, (32.32, -106.77), "eng").most_common()
- assert len(libraries) == 2
- assert set([l[0] for l in libraries]) == set([unm, internet_archive])
-
-
- # Russian speaker in Albany. Albany doesn't pass the score threshold
- # since it didn't report having any Russian books, but maybe we should
- # consider the total collection size as well as the user's language.
- libraries = Library.relevant(self._db, (42.66, -73.77), "rus").most_common()
- assert len(libraries) == 2
- assert [l[0] for l in libraries] == [nypl, internet_archive]
-
- # Spanish speaker in Manhattan.
- libraries = Library.relevant(self._db, (40.75, -73.98), "spa").most_common()
- assert len(libraries) == 4
- assert [l[0] for l in libraries] == [nypl, bpl, internet_archive, unm]
-
- # Patron with a print disability in Manhattan.
- libraries = Library.relevant(self._db, (40.75, -73.98), "eng", audiences=[Audience.PRINT_DISABILITY]).most_common()
- assert len(libraries) == 5
- assert [l[0] for l in libraries] == [bard, nypl, bpl, internet_archive, nyu_press]
-
- def test_nearby(self):
- # Create two libraries. One serves New York City, and one serves
- # the entire state of Connecticut.
- nypl = self._library(
- "New York Public Library", eligibility_areas=[self.new_york_city]
- )
- ct_state = self._library(
- "Connecticut State Library", eligibility_areas=[self.connecticut_state]
- )
-
- # From this point in Brooklyn, NYPL is the closest library.
- # NYPL's service area includes that point, so the distance is
- # zero. The service area of CT State (i.e. the Connecticut
- # border) is only 44 kilometers away, so it also shows up.
- [(lib1, d1), (lib2, d2)] = Library.nearby(self._db, (40.65, -73.94))
-
- assert d1 == 0
- assert lib1 == nypl
-
- assert int(d2/1000) == 44
- assert lib2 == ct_state
-
- # From this point in Connecticut, CT State is the closest
- # library (0 km away), so it shows up first, but NYPL (61 km
- # away) also shows up as a possibility.
- [(lib1, d1), (lib2, d2)] = Library.nearby(self._db, (41.3, -73.3))
- assert lib1 == ct_state
- assert d1 == 0
-
- assert lib2 == nypl
- assert int(d2/1000) == 61
-
- # From this point in Pennsylvania, NYPL shows up (142km away) but
- # CT State does not.
- [(lib1, d1)] = Library.nearby(self._db, (40, -75.8))
- assert lib1 == nypl
- assert int(d1/1000) == 142
-
- # If we only look within a 100km radius, then there are no
- # libraries near that point in Pennsylvania.
- assert Library.nearby(self._db, (40, -75.8), 100).all() == []
-
- # By default, nearby() only finds libraries that are in production.
- def m(production):
- return Library.nearby(
- self._db, (41.3, -73.3), production=production
- ).count()
- # Take all the libraries we found earlier out of production.
- for l in ct_state, nypl:
- l.registry_stage = Library.TESTING_STAGE
- # Now there are no results.
- assert m(True) == 0
-
- # But we can run a search that includes libraries in the TESTING stage.
- assert m(False) == 2
-
- def test_query_cleanup(self):
- m = Library.query_cleanup
-
- assert m("THE LIBRARY") == "the library"
- assert m("\tthe library\n\n") == "the library"
- assert m("the libary") == "the library"
-
- def test_as_postal_code(self):
- m = Library.as_postal_code
- # US ZIP codes are recognized as postal codes.
- assert m("93203") == "93203"
- assert m("93203-1234") == "93203"
- assert m("the library") is None
-
- # A UK post code is not currently recognized.
- assert m("AB1 0AA") is None
-
- def test_query_parts(self):
- m = Library.query_parts
- assert m("93203") == (None, "93203", Place.POSTAL_CODE)
- assert m("new york public library") == ("new york public library", "new york", None)
- assert m("queens library") == ("queens library", "queens", None)
- assert m("kern county library") == ("kern county library", "kern", Place.COUNTY)
- assert m("new york state library") == ("new york state library", "new york", Place.STATE)
- assert m("lapl") == ("lapl", "lapl", None)
+ assert library.service_area_name is None
def test_search_by_library_name(self):
def search(name, here=None, **kwargs):
@@ -1085,24 +490,29 @@ def search(name, here=None, **kwargs):
self._db, LibraryAlias, name="BPL", language=None,
library=library
)
- assert set(search("bpl")) == set([brooklyn, boston])
-
+ assert set(search("bpl")) == set([brooklyn, boston])
+
# We do not tolerate typos in short names, because the chance of
# ambiguity is so high.
assert search("opl") == []
# If we're searching for "BPL" from California, Brooklyn shows
# up first, because it's closer to California.
- assert [x[0].name for x in search("bpl", GeometryUtility.point(35, -118))] == ["Brooklyn Public Library", "Boston Public Library"]
+ assert [
+ x[0].name
+ for x in search("bpl", GeometryUtility.point(35, -118))
+ ] == ["Brooklyn Public Library", "Boston Public Library"]
# If we're searching for "BPL" from Maine, Boston shows
# up first, because it's closer to Maine.
- assert [x[0].name for x in search("bpl", GeometryUtility.point(43, -70))] == ["Boston Public Library", "Brooklyn Public Library"]
+ assert [
+ x[0].name for x in search("bpl", GeometryUtility.point(43, -70))
+ ] == ["Boston Public Library", "Brooklyn Public Library"]
# By default, search_by_library_name() only finds libraries
# in production. Put them in the TESTING stage and they disappear.
- for l in (brooklyn, boston):
- l.registry_stage = Library.TESTING_STAGE
+ for lib in (brooklyn, boston):
+ lib.registry_stage = Library.TESTING_STAGE
assert search("bpl", production=True) == []
# But you can find them by passing in production=False.
@@ -1112,7 +522,7 @@ def test_search_by_location(self):
# We know about three libraries.
nypl = self.nypl
kansas_state = self.kansas_state_library
- connecticut_state = self.connecticut_state_library
+ connecticut_state = self.connecticut_state_library # noqa: F841
# The NYPL explicitly covers New York City, which has
# 'Manhattan' as an alias.
@@ -1124,7 +534,7 @@ def test_search_by_location(self):
[kansas] = [x.place for x in kansas_state.service_areas]
assert kansas.external_name == "Kansas"
assert kansas.type == Place.STATE
- manhattan_ks = self.manhattan_ks
+ manhattan_ks = self.manhattan_ks # noqa: F841
# A search for 'manhattan' finds both libraries.
libraries = list(Library.search_by_location_name(self._db, "manhattan"))
@@ -1161,10 +571,12 @@ def test_search_by_location(self):
assert brooklyn_results[0] == nypl
nypl.registry_stage = Library.TESTING_STAGE
- assert Library.search_by_location_name(self._db, "brooklyn", here=GeometryUtility.point(43, -70), production=True).all() == []
-
- assert Library.search_by_location_name(self._db, "brooklyn", here=GeometryUtility.point(43, -70), production=False).count() == 1
-
+ assert Library.search_by_location_name(
+ self._db, "brooklyn", here=GeometryUtility.point(43, -70), production=True).all() == []
+
+ assert Library.search_by_location_name(
+ self._db, "brooklyn", here=GeometryUtility.point(43, -70), production=False).count() == 1
+
def test_search_within_description(self):
"""Test searching for a phrase within a library's description."""
library = self._library(
@@ -1174,6 +586,7 @@ def test_search_within_description(self):
results = list(Library.search_within_description(self._db, "testing purposes"))
assert results == [library]
+ @pytest.mark.skip(reason="replacing this with new search")
def test_search(self):
"""Test the overall search method."""
@@ -1183,7 +596,7 @@ def test_search(self):
# Here's a library whose service area includes a place called
# "New York".
- nypl = self.nypl
+ nypl = self.nypl # noqa: F841
libraries = Library.search(self._db, (40.7, -73.9), "NEW YORK")
# Even though NYPL is closer to the current location, the
@@ -1210,6 +623,7 @@ def test_search(self):
# By default, search() only finds libraries in production.
self.nypl.registry_stage = Library.TESTING_STAGE
new_work.registry_stage = Library.TESTING_STAGE
+
def m(production):
return len(
Library.search(
@@ -1222,6 +636,7 @@ def m(production):
# by passing in production=False.
assert m(False) == 2
+ @pytest.mark.skip("replacing this")
def test_search_excludes_duplicates(self):
# Here's a library that serves a place called Kansas
# whose name is also "Kansas"
@@ -1256,13 +671,13 @@ def test_unrecognized_language_is_set_as_unknown(self):
assert summary.size == 100
def test_size_must_be_integerable(self):
- library = self._library()
+ library = self._library()
with pytest.raises(ValueError) as exc:
CollectionSummary.set(library, "eng", "fruit")
assert "invalid literal for" in str(exc.value)
def test_negative_size_is_not_allowed(self):
- library = self._library()
+ library = self._library()
with pytest.raises(ValueError) as exc:
CollectionSummary.set(library, "eng", "-1")
assert "Collection size cannot be negative." in str(exc.value)
@@ -1281,8 +696,10 @@ def test_get_one_or_create(self):
library = self._library()
patron_identifier = self._str
identifier_type = DelegatedPatronIdentifier.ADOBE_ACCOUNT_ID
+
def make_id():
return "id1"
+
identifier, is_new = DelegatedPatronIdentifier.get_one_or_create(
self._db, library, patron_identifier, identifier_type,
make_id
@@ -1306,6 +723,7 @@ def explode():
# id_2() was not called.
assert identifier2.delegated_identifier == "id1"
+
class TestExternalIntegration(DatabaseTest):
def setup(self):
@@ -1352,6 +770,7 @@ def test_explain(self):
with_secrets = integration.explain(include_secrets=True)
assert "password='somepass'" in with_secrets
+
class TestConfigurationSetting(DatabaseTest):
def test_is_secret(self):
@@ -1518,7 +937,7 @@ def test_json_value(self):
assert jsondata.int_value is None
jsondata.value = "[1,2]"
- assert jsondata.json_value == [1,2]
+ assert jsondata.json_value == [1, 2]
jsondata.value = "tra la la"
with pytest.raises(ValueError):
@@ -1671,7 +1090,7 @@ def test_restart_validation(self):
# Let's imagine that validation succeeded and is being
# invalidated for some reason.
email_validation.success = True
- old_started_at = email_validation.started_at
+ old_started_at = email_validation.started_at # noqa: F841
old_secret = email_validation.secret
email_validation_2 = email.restart_validation()
diff --git a/tests/test_opds.py b/tests/test_opds.py
index fed6ed11..2bead98f 100644
--- a/tests/test_opds.py
+++ b/tests/test_opds.py
@@ -12,6 +12,7 @@
ConfigurationSetting,
Hyperlink,
Library,
+ LibraryType,
Validation,
)
from opds import OPDSCatalog
@@ -28,6 +29,7 @@ def mock_url_for(self, route, uuid, **kwargs):
def test_library_catalogs(self):
l1 = self._library("The New York Public Library")
l2 = self._library("Brooklyn Public Library")
+
class TestAnnotator(object):
def annotate_catalog(self, catalog_obj, live=True):
catalog_obj.catalog['metadata']['random'] = "Random text inserted by annotator."
@@ -84,26 +86,26 @@ def test_large_feeds_treated_differently(self):
class Mock(OPDSCatalog):
def library_catalog(*args, **kwargs):
# Every time library_catalog is called, record whether
- # we were asked to include a logo.
- return kwargs['include_logo']
+ # we were asked to include logo and service area.
+ return kwargs['include_logo'], kwargs['include_service_area']
# Every item in the large feed resulted in a call with
- # include_logo=False.
+ # include_logo=False and include_service_areas=False.
large_feed = Mock(self._db, "title", "url", ["it's", "large"])
large_catalog = large_feed.catalog['catalogs']
- assert large_catalog == [False, False]
+ assert large_catalog == [(False, False), (False, False)]
- # Every item in the large feed resulted in a call with
- # include_logo=True.
+ # Every item in the small feed resulted in a call with
+ # include_logo=True and include_service_areas=True.
small_feed = Mock(self._db, "title", "url", ["small"])
small_catalog = small_feed.catalog['catalogs']
- assert small_catalog == [True]
+ assert small_catalog == [(True, True)]
# Make it so even a feed with one item is 'large'.
setting.value = 1
small_feed = Mock(self._db, "title", "url", ["small"])
small_catalog = small_feed.catalog['catalogs']
- assert small_catalog == [False]
+ assert small_catalog == [(False, False)]
# Try it with a query that returns no results. No catalogs
# are included at all.
@@ -130,7 +132,7 @@ def test_feed_is_large(self):
assert m(self._db, query) is True
# It also works with a list.
- assert m(self._db, [1,2]) is True
+ assert m(self._db, [1, 2]) is True
assert m(self._db, [1]) is False
def test_library_catalog(self):
@@ -144,7 +146,9 @@ def _hyperlink_args(cls, hyperlink):
cls.hyperlinks.append(hyperlink)
return OPDSCatalog._hyperlink_args(hyperlink)
- library = self._library("The New York Public Library")
+ library = self._library(
+ "The New York Public Library", focus_areas=[self.new_york_city]
+ )
library.urn = "123-abc"
library.description = "It's a wonderful library."
library.opds_url = "https://opds/"
@@ -167,16 +171,46 @@ def _hyperlink_args(cls, hyperlink):
catalog = Mock.library_catalog(
library, url_for=self.mock_url_for,
- web_client_uri_template="http://web/{uuid}"
+ web_client_uri_template="http://web/{uuid}",
+ distance=14244, include_service_area=True
)
metadata = catalog['metadata']
assert metadata['title'] == library.name
assert metadata['id'] == library.internal_urn
assert metadata['description'] == library.description
- assert metadata['updated'] == OPDSCatalog._strftime(library.timestamp)
-
- [authentication_url, web_alternate, help, eligibility, focus, opds_self, web_self] = sorted(catalog['links'], key=lambda x: (x.get('rel', ''), x.get('type', '')))
+ # The distance between the current location and the edge of
+ # the library's service area is published as 'schema:distance'
+ # and also (for backwards compatibility) as 'distance'
+ for key in ('schema:distance', 'distance'):
+ assert metadata[key] == '14 km.'
+
+ # The library's updated timestamp is published as 'modified'
+ # and also (for backwards compatibility) as 'updated'.
+ timestamp = OPDSCatalog._strftime(library.timestamp)
+ for key in ('modified', 'updated'):
+ assert metadata[key] == timestamp
+
+ # If the library's service area is easy to explain in human-friendly
+ # terms, it is explained in 'schema:areaServed'.
+ assert metadata['schema:areaServed'] == "New York, NY"
+
+ # That also means the library will be given an OPDS subject
+ # corresponding to its type.
+ [subject] = metadata['subject']
+ assert LibraryType.SCHEME_URI == subject['scheme']
+ assert LibraryType.LOCAL == subject['code']
+ assert LibraryType.NAME_FOR_CODE[LibraryType.LOCAL] == subject['name']
+
+ (
+ authentication_url,
+ web_alternate,
+ help,
+ eligibility,
+ focus,
+ opds_self,
+ web_self
+ ) = sorted(catalog['links'], key=lambda x: (x.get('rel', ''), x.get('type', '')))
[logo] = catalog['images']
assert help['href'] == "mailto:help@library.org"
@@ -224,16 +258,37 @@ def _hyperlink_args(cls, hyperlink):
)
assert set(Mock.hyperlinks) == set([public_hyperlink, private_hyperlink])
- # If library_catalog is passed with include_logo=False,
- # the (potentially large) inline logo is omitted,
+ # If library_catalog is called with include_logo=False,
+ # the (potentially large) inline logo is omitted,
# even though it was included before.
catalog = Mock.library_catalog(
- library, include_logo=False,
+ library, include_logo=False,
url_for=self.mock_url_for
)
relations = [x.get('rel') for x in catalog['links']]
assert OPDSCatalog.THUMBNAIL_REL not in relations
+ # If library_catalog is called with
+ # include_service_area=False, information about the library's
+ # service area is not included in the library's OPDS entry.
+ catalog = Mock.library_catalog(
+ library, url_for=self.mock_url_for,
+ include_service_area=False
+ )
+ for missing_key in (
+ 'schema:areaServed', 'schema:distance', 'distance', 'subject'
+ ):
+ assert missing_key not in catalog['metadata']
+
+ # The same holds true if service area information is not available.
+ library.service_areas = []
+ catalog = Mock.library_catalog(
+ library, url_for=self.mock_url_for, include_service_area=True
+ )
+ for missing_key in (
+ 'schema:areaServed', 'schema:distance', 'distance', 'subject'
+ ):
+ assert missing_key not in catalog['metadata']
def test__hyperlink_args(self):
"""Verify that _hyperlink_args generates arguments appropriate
diff --git a/tests/test_scripts.py b/tests/test_scripts.py
index c93f7472..095a5f72 100644
--- a/tests/test_scripts.py
+++ b/tests/test_scripts.py
@@ -152,6 +152,7 @@ def test_run(self):
class TestSearchLibraryScript(DatabaseTest):
+ @pytest.mark.skip(reason="replacing search")
def test_run(self):
nys = self.new_york_state
nypl = self.nypl
diff --git a/tests/test_util_geo.py b/tests/test_util_geo.py
new file mode 100644
index 00000000..8468b25f
--- /dev/null
+++ b/tests/test_util_geo.py
@@ -0,0 +1,220 @@
+import pytest
+
+from util.geo import (
+ InvalidLocationException,
+ Location,
+ LATLONG_STRING_REGEX,
+ LATLONG_WKT_EWKT_REGEX,
+)
+
+
+class TestUtilGeoRegex:
+ @pytest.mark.parametrize(
+ "input_string,matches",
+ [
+ pytest.param("0, 0", ("0", "0"), id="zero_ints"),
+ pytest.param("0.0, 0.0", ("0.0", "0.0"), id="zero_floats"),
+ pytest.param("5.1, 5.2", ("5.1", "5.2"), id="single_digit_int_part"),
+ pytest.param("11.1, 11.2", ("11.1", "11.2"), id="double_digit_int_part"),
+ pytest.param("89, 179", ("89", "179"), id="int_both_values"),
+ pytest.param("89, 179.1", ("89", "179.1"), id="int_first_value"),
+ pytest.param("89.1, 179", ("89.1", "179"), id="int_second_value"),
+ pytest.param("89.1, 179.1", ("89.1", "179.1"), id="float_both_values"),
+ pytest.param("89.123456, 179.123456", ("89.123456", "179.123456"), id="six_digits_precision"),
+ pytest.param("89.123456,179.123456", ("89.123456", "179.123456"), id="no_space_separator"),
+ pytest.param("89.123456 179.123456", ("89.123456", "179.123456"), id="no_comma_separator"),
+ pytest.param("89.123456, 179.123456", ("89.123456", "179.123456"), id="multi_space_separator"),
+ pytest.param("89.123456 179.123456", ("89.123456", "179.123456"), id="multi_space_no_comma_separator"),
+ pytest.param("91.12345, 181.12345", None, id="values_out_of_range"),
+ ]
+ )
+ def test_latlong_string_regex(self, input_string, matches):
+ """
+ GIVEN: An input string
+ WHEN: The LATLONG_STRING_REGEX.match() is called on that string
+ THEN: Latitude and longitude values should be extracted if:
+ * The latitude appears at the start of the string
+ * The latitude is composed of an integer part from 0 to 90, and an optional decimal part
+ * The two numbers are separated by at least one space or comma, followed by zero or more spaces
+ * The longitude is composed of an integer part from 0 to 180, and an optional decimal part
+ * The longitude appears at the end of the string
+ """
+ match_obj = LATLONG_STRING_REGEX.match(input_string)
+
+ if matches is None:
+ assert match_obj is None
+ else:
+ assert match_obj.group('latitude') == matches[0]
+ assert match_obj.group('longitude') == matches[1]
+
+ @pytest.mark.parametrize(
+ "input_string,matches",
+ [
+ pytest.param("POINT(0 0)", (None, "0", "0"), id="wkt_zero_ints"),
+ pytest.param("POINT(0.0 0.0)", (None, "0.0", "0.0"), id="wkt_zero_floats"),
+ pytest.param("POINT(5.2 5.1)", (None, "5.1", "5.2"), id="wkt_single_digit_int_part"),
+ pytest.param("POINT(11.2 11.1)", (None, "11.1", "11.2"), id="wkt_double_digit_int_part"),
+ pytest.param("POINT(179 89)", (None, "89", "179"), id="wkt_int_both_values"),
+ pytest.param("POINT(179 89.1)", (None, "89.1", "179"), id="wkt_int_first_value"),
+ pytest.param("POINT(179.1 89)", (None, "89", "179.1"), id="wkt_int_second_value"),
+ pytest.param("POINT(179.1 89.1)", (None, "89.1", "179.1"), id="wkt_float_both_values"),
+ pytest.param("POINT(179.123456 89.123456)", (None, "89.123456", "179.123456"), id="six_digits_precision"),
+ pytest.param("POINT(181.12345 91.12345)", None, id="wkt_values_out_of_range"),
+ pytest.param("SRID=4326;POINT(0 0)", ("4326", "0", "0"), id="ewkt_zero_ints"),
+ pytest.param("SRID=3857;POINT(170.144 20.03)", ("3857", "20.03", "170.144"), id="ewkt_zero_ints"),
+ ]
+ )
+ def test_latlong_wkt_ewkt_regex(self, input_string, matches):
+ """
+ GIVEN: An input string that may contain a WKT or EWKT Point
+ WHEN: LATLONG_WKT_EKT_REGEX.match() is called on that string
+ THEN: Latitude, and Longitude values should be extracted if:
+ * They appear inside a 'POINT()' enclosure, longitude first, space separated
+ * The longitude is composed of an integer part from 0 to 180, and an optional decimal part
+ * The latitude is composed of an integer part from 0 to 90, and an optional decimal part
+ SRID should optionally be extracted if:
+ * The string begins with SRID=
+ * The following characters are integers, terminated by a semi-colon
+ """
+ match_obj = LATLONG_WKT_EWKT_REGEX.match(input_string)
+
+ if matches is None:
+ assert match_obj is None
+ else:
+ assert match_obj.groupdict()['srid'] == matches[0]
+ assert match_obj.group('latitude') == matches[1]
+ assert match_obj.group('longitude') == matches[2]
+
+
+class TestLocation:
+ def test_instantiate_success(self):
+ """
+ GIVEN: A valid representation of a location
+ WHEN: A Location object is instantiated based on that location
+ THEN: A valid Location object should be created
+ """
+ latitude = 40.75238
+ longitude = -73.98018
+ srid = 4326
+ wkt = f"POINT({longitude} {latitude})"
+ ewkt = f"SRID={srid};{wkt}"
+
+ location_obj = Location(ewkt)
+
+ assert location_obj.latitude == latitude
+ assert location_obj.longitude == longitude
+ assert location_obj.srid == srid
+ assert location_obj.in_ocean is False
+ assert location_obj.wkt == wkt
+ assert location_obj.ewkt == ewkt
+
+ def test_instantiate_failure(self):
+ """
+ GIVEN: An invalid representation of a location
+ WHEN: A Location object is instanted based on that location
+ THEN: InvalidLocationException should be raised
+ """
+ with pytest.raises(InvalidLocationException):
+ Location((95.5, 100.5, 3857)) # Invalid latitude
+
+ with pytest.raises(InvalidLocationException):
+ Location((89.5, 195.5)) # Invalid longitude
+
+ @pytest.mark.parametrize(
+ "location_one,location_two,result",
+ [
+ pytest.param(
+ 'POINT(-129.000001 38.000001)', 'POINT(-129.000002 38.000002)', False, id="unequal_last_digit"
+ ),
+ pytest.param(
+ 'POINT(-129.000001 38.000001)', 'POINT(-129.000001 38.000001)', True, id="equal_to_six_digits"
+ ),
+ pytest.param(
+ 'POINT(-129 38)', 'POINT(-129.0 38.0)', True, id="integer_input"
+ ),
+ pytest.param(
+ 'POINT(-129.0000036 38.0000036)', 'POINT(-129.0000039 38.0000039)', True, id="rounding_seven_digits"
+ )
+ ]
+ )
+ def test_equality(self, location_one, location_two, result):
+ """
+ GIVEN: Two objects, at least one of which is a Location
+ WHEN: They are compared using the == equality operator
+ THEN: The boolean value returned by the comparison should be True if:
+ * Both objects are Location instances
+ * The latitude and longitude of the instances are the same
+ when rounded to six digits of precision.
+ """
+ assert bool(Location(location_one) == Location(location_two)) is result
+
+ @pytest.mark.parametrize(
+ "location,result",
+ [
+ pytest.param((34.03, -139.64), True, id="pacific_ocean_1"),
+ pytest.param((13.51, -109.45), True, id="pacific_ocean_2"),
+ pytest.param((18.35, -179.28), True, id="pacific_ocean_3"),
+ pytest.param((17.69, 170.09), True, id="pacific_ocean_4"),
+ pytest.param((-49.77, 122.08), True, id="pacific_ocean_5"),
+ pytest.param((17.44, 137.49), True, id="phillipine_sea"),
+ pytest.param((12.99, 87.47), True, id="bay_of_bengal"),
+ pytest.param((-17.60, 80.80), True, id="indian_ocean"),
+ pytest.param((12.13, 65.11), True, id="arabian_sea"),
+ pytest.param((-65.33, -162.55), True, id="southern_ocean"),
+ pytest.param((-21.14, -13.30), True, id="south_atlantic"),
+ pytest.param((52.94, -30.55), True, id="north_atlantic_1"),
+ pytest.param((23.32, -41.26), True, id="north_atlantic_2"),
+ pytest.param((25.20, -88.55), True, id="gulf_of_mexico"),
+ pytest.param((40.75238, -73.98018), False, id="nyc"),
+ pytest.param((32.94, -96.82), False, id="texas"),
+ ]
+ )
+ def test_latlong_in_ocean(self, location, result):
+ """
+ GIVEN: A valid, well-formed location (as per normalize_point_input)
+ WHEN: Location.location_in_ocean() is called on those values
+ THEN: A boolean value is returned, representing a guess about whether the point
+ those coordinates describe is in the middle of the ocean.
+ """
+ assert Location.location_in_ocean(location) is result
+
+ @pytest.mark.parametrize(
+ "input_point,result",
+ [
+ pytest.param((33.33, 105.5), (33.33, 105.5, None), id="valid_two_tuple"),
+ pytest.param(("a", "b"), (None, None, None), id="invalid_two_tuple"),
+ pytest.param((95.5, 105.5, 3857), (None, None, None), id="tuple_invalid_latitude"),
+ pytest.param((85.5, 185.5, 3857), (None, None, None), id="tuple_invalid_longitude"),
+ pytest.param((85.5, 175.5, 3857.5), (85.5, 175.5, None), id="tuple_invalid_srid_float"),
+ pytest.param((85.5, 175.5, "3857.5"), (85.5, 175.5, None), id="tuple_invalid_srid_string"),
+ pytest.param(("33.33", "b"), (None, None, None), id="invalid_two_tuple"),
+ pytest.param((33.33, 105.5, 3857), (33.33, 105.5, 3857), id="valid_three_tuple"),
+ pytest.param(("a", "b", "c"), (None, None, None), id="invalid_three_tuple"),
+ pytest.param((33.33, 105.5, 3857), (33.33, 105.5, 3857), id="valid_three_tuple"),
+ pytest.param("33.33, 105.5", (33.33, 105.5, None), id="comma_separated_string"),
+ pytest.param("33.33 105.5", (33.33, 105.5, None), id="space_separated_string"),
+ pytest.param("POINT(102.11 82.3)", (82.3, 102.11, None), id="wkt_string"),
+ pytest.param("SRID=4326;POINT(102.11 82.3)", (82.3, 102.11, 4326), id="ewkt_string"),
+ pytest.param("not a real value", (None, None, None), id="bad_string_input"),
+ pytest.param("SRID=4326.0;POINT(102.11 82.3)", (None, None, None), id="ewkt_invalid_srid"),
+ pytest.param("SRID=4326;POINT(100.1 101.2)", (None, None, None), id="ewkt_invalid_latitude"),
+ pytest.param("SRID=4326;POINT(200.1, 89.1)", (None, None, None), id="ewkt_invalid_longitude"),
+ ]
+ )
+ def test_normalize_location_input(self, input_point, result):
+ """
+ GIVEN: A representation of a latitude/longitude point
+ WHEN: Location.normalize_location_input() is called on that representation
+ THEN: A 3-tuple of (latitude, longitude, srid) should be returned
+ """
+ (latitude, longitude, srid) = Location.normalize_location_input(input_point)
+ assert (latitude, longitude, srid) == result
+
+ if latitude:
+ assert isinstance(latitude, float)
+
+ if longitude:
+ assert isinstance(longitude, float)
+
+ if srid:
+ assert isinstance(srid, int)
diff --git a/tests/test_util_search.py b/tests/test_util_search.py
new file mode 100644
index 00000000..1d212251
--- /dev/null
+++ b/tests/test_util_search.py
@@ -0,0 +1,512 @@
+import math
+
+import pytest
+from util.search import (SIMPLE_POSTCODE_RE, InvalidLSToken,
+ LSBaseTokenClassifier, LSQuery, LSToken, LSTokenSequence)
+
+
+class TestLSToken:
+ def test_string_context(self):
+ """
+ GIVEN: An LSToken instance
+ WHEN: That instance is evaluated in a string context
+ THEN: The string stored in the instance's .value attribute should be returned
+ """
+ t_value = "alpha"
+ t = LSToken(t_value)
+ assert str(t) == t_value
+ assert str(t) == t.value
+
+ def test_instance_equality(self):
+ """
+ GIVEN: Two LSToken instances
+ WHEN: They are compared using the == or != equality comparison operators
+ THEN: True should be returned if they have the same .value attribute
+ """
+ same_value = "alpha"
+ diff_value = "bravo"
+ t1 = LSToken(same_value)
+ t2 = LSToken(same_value)
+ t3 = LSToken(diff_value)
+
+ assert t1 == t2 and id(t1) != id(t2)
+ assert t1 != t3
+
+ def test_is_multiword(self):
+ """
+ GIVEN: An LSToken instance
+ WHEN: That instance's .is_multiword property is accessed
+ THEN: An appropriate boolean value should be returned
+ """
+ t_single = LSToken("alpha")
+ t_multi = LSToken("alpha bravo")
+ assert t_single.is_multiword is False
+ assert t_multi.is_multiword is True
+
+ def test_type_validation(self):
+ """
+ GIVEN: A string value and a string type
+ WHEN: An LSToken is instantiated with those values
+ THEN: The .type attribute should be set if it is a valid type
+ """
+ token_value = "alpha"
+
+ type_valid = LSToken.POSTCODE
+ token_one = LSToken(token_value, token_type=type_valid)
+ assert token_one.type == type_valid
+
+ type_invalid = "an invalid type"
+ token_two = LSToken(token_value, token_type=type_invalid)
+ assert token_two.type is None
+
+ @pytest.mark.parametrize(
+ "input_value",
+ [None, 1, ["alpha", "bravo"], lambda f: f.lower()]
+ )
+ def test_value_validation(self, input_value):
+ """
+ GIVEN: No pre-requisites
+ WHEN: An LSToken is instantiated with a non-string value
+ THEN: An InvalidLSToken exception is raised
+ """
+ with pytest.raises(InvalidLSToken):
+ LSToken(input_value)
+
+ @pytest.mark.parametrize(
+ "input_string,token_value",
+ [
+ (" a b ", "a b"),
+ (" \n alpha", "alpha"),
+ ("bravo \t\t", "bravo"),
+ ]
+ )
+ def test_value_whitespace_normalization(self, input_string, token_value):
+ """
+ GIVEN: No pre-requisites
+ WHEN: An LSToken is instantiated with a string containing whitespace
+ THEN: The resulting object's .value should be stripped of leading and trailing
+ whitespace characters, and any runs of internal whitespace should be
+ reduced to a single space each.
+ """
+ assert LSToken(input_string).value == token_value
+
+
+class TestLSTokenSequence:
+ def test_create_from_token_objects(self):
+ """
+ GIVEN: A list of LSToken objects
+ WHEN: Those LSToken objects are used to instantiate an LSTokenSequence
+ THEN: The .tokens attribute of the LSTokenSequence should include the passed objects
+ """
+ words = ["alpha", "bravo", "charlie", "delta", "echo"]
+ token_objects = [LSToken(w) for w in words]
+ sequence = LSTokenSequence(token_objects)
+ assert sequence.tokens == token_objects
+
+ def test_create_from_strings(self):
+ """
+ GIVEN: A list of strings
+ WHEN: Those strings are used to instantiate an LSTokenSequence
+ THEN: The .tokens attribute of the LSTokenSequence should be a list of LSToken objects
+ created from the strings passed in.
+ """
+ words = ["alpha", "bravo", "charlie", "delta", "echo"]
+ token_objects = [LSToken(w) for w in words]
+ sequence = LSTokenSequence(words)
+ assert sequence.tokens == token_objects
+
+ def test_string_context(self):
+ """
+ GIVEN: An LSTokenSequence instance
+ WHEN: That instance is evaluated in a string context
+ THEN: A space-separated string of its component tokens should result
+ """
+ words = ["alpha", "bravo", "charlie", "delta", "echo"]
+ token_objects = [LSToken(w) for w in words]
+ sequence = LSTokenSequence(token_objects)
+ assert str(sequence) == " ".join(words)
+
+ def test_length_context(self):
+ """
+ GIVEN: An LSTokenSequence instance
+ WHEN: That instance is passed to the len() built-in
+ THEN: The return value should represent the number of values in the .tokens list attribute
+ """
+ words = ["alpha", "bravo", "charlie", "delta", "echo"]
+ token_objects = [LSToken(w) for w in words]
+ sequence = LSTokenSequence(token_objects)
+ assert len(sequence) == len(words)
+
+ @pytest.mark.parametrize(
+ "input_tokens,result",
+ [
+ pytest.param(
+ [
+ ("Alabama", LSToken.STATE_NAME),
+ ("Nevada", LSToken.STATE_NAME),
+ ("Michigan", LSToken.STATE_NAME),
+ ],
+ True,
+ id="three_classified_tokens"
+ ),
+ pytest.param(
+ [
+ ("alpha", None),
+ ("bravo", None),
+ ("charlie", None),
+ ],
+ False,
+ id="three_unclassified_tokens"
+ ),
+ pytest.param(
+ [
+ ("alpha", None),
+ ("Nevada", LSToken.STATE_NAME),
+ ("bravo", None),
+ ],
+ False,
+ id="mixed_classified_and_unclassified"
+ ),
+ ]
+ )
+ def test_all_classified_property(self, input_tokens, result):
+ """
+ GIVEN: An LSTokenSequence instance
+ WHEN: The .all_classified property of that instance is evaluated
+ THEN: If all LSTokens in .tokens already have a .type, return True, else False
+ """
+ token_objects = [LSToken(x[0], token_type=x[1]) for x in input_tokens]
+ sequence = LSTokenSequence(token_objects)
+ assert sequence.all_classified == result
+
+ @pytest.mark.parametrize(
+ "input_tokens,result",
+ [
+ pytest.param(
+ [
+ ("Alabama", LSToken.STATE_NAME),
+ ("Nevada", LSToken.STATE_NAME),
+ ("Michigan", LSToken.STATE_NAME),
+ ],
+ 0,
+ id="three_classified_tokens"
+ ),
+ pytest.param(
+ [
+ ("alpha", None),
+ ("bravo", None),
+ ("charlie", None),
+ ],
+ 3,
+ id="three_unclassified_tokens"
+ ),
+ pytest.param(
+ [
+ ("alpha", None),
+ ("Nevada", LSToken.STATE_NAME),
+ ("bravo", None),
+ ],
+ 2,
+ id="mixed_classified_and_unclassified"
+ ),
+ ]
+ )
+ def test_unclassified_count_property(self, input_tokens, result):
+ """
+ GIVEN: An LSTokenSequence instance
+ WHEN: The .unclassified_count property of that instance is evaluated
+ THEN: An integer representing the number of unclassified tokens in .tokens should be returned
+ """
+ token_objects = [LSToken(x[0], token_type=x[1]) for x in input_tokens]
+ sequence = LSTokenSequence(token_objects)
+ assert sequence.unclassified_count == result
+
+ @pytest.mark.parametrize(
+ "input_items,expected_max_run",
+ [
+ pytest.param(
+ [
+ ("alpha", LSToken.CITY_NAME),
+ ("bravo", None),
+ ("charlie", None),
+ ("delta", LSToken.CITY_NAME),
+ ("echo", LSToken.CITY_NAME),
+ ("foxtrot", None),
+ ("golf", None),
+ ("hotel", None),
+ ("india", None),
+ ("juliet", LSToken.CITY_NAME),
+ ],
+ 4,
+ id="max_run_of_four"
+ ),
+ pytest.param([("alpha", None)], 1, id="single_item"),
+ pytest.param(
+ [
+ ("alpha", LSToken.CITY_NAME),
+ ("bravo", LSToken.CITY_NAME),
+ ("charlie", LSToken.CITY_NAME),
+ ("delta", LSToken.CITY_NAME),
+ ("echo", LSToken.CITY_NAME),
+ ],
+ 0,
+ id="zero_runs"
+ )
+ ]
+ )
+ def test_longest_unclassified_run_property(self, input_items, expected_max_run):
+ """
+ GIVEN: An LSTokenSequence instance
+ WHEN: The .longest_unclassified_run property is accessed
+ THEN: An integer should be returned representing the longest consecutive sequence
+ of tokens in that list whose .type attributes evaluate to None.
+ """
+ tokens = [LSToken(x[0], token_type=x[1]) for x in input_items]
+ sequence = LSTokenSequence(tokens)
+ assert sequence.longest_unclassified_run == expected_max_run
+
+ @pytest.mark.parametrize(
+ "tokens,target_list,merged_token_type,max_words,results",
+ [
+ pytest.param(
+ [("alpha", None)],
+ ["a target", "another target"],
+ LSToken.STATE_NAME,
+ 3,
+ [("alpha", None)],
+ id="single_token_unclassified"
+ ),
+ pytest.param(
+ [
+ ("alpha", None),
+ ("bravo", None),
+ ("charlie", None),
+ ("delta", LSToken.CITY_NAME),
+ ("echo", LSToken.CITY_NAME),
+ ("foxtrot", LSToken.CITY_NAME),
+ ],
+ ["a target", "another target", "bravo charlie", "alpha charlie"],
+ LSToken.STATE_NAME,
+ 3,
+ [
+ ("alpha", None),
+ ("bravo charlie", LSToken.STATE_NAME),
+ ("delta", LSToken.CITY_NAME),
+ ("echo", LSToken.CITY_NAME),
+ ("foxtrot", LSToken.CITY_NAME),
+ ],
+ id="two_word_match"
+ ),
+ pytest.param(
+ [
+ ("alpha", None),
+ ("bravo", None),
+ ("charlie", None),
+ ("delta", LSToken.CITY_NAME),
+ ("echo", LSToken.CITY_NAME),
+ ("foxtrot", LSToken.CITY_NAME),
+ ],
+ ["a target", "another target", "alpha bravo charlie", "alpha charlie"],
+ LSToken.STATE_NAME,
+ 3,
+ [
+ ("alpha bravo charlie", LSToken.STATE_NAME),
+ ("delta", LSToken.CITY_NAME),
+ ("echo", LSToken.CITY_NAME),
+ ("foxtrot", LSToken.CITY_NAME),
+ ],
+ id="three_word_match"
+ ),
+ pytest.param(
+ [
+ ("alpha", None),
+ ("bravo", None),
+ ("charlie", None),
+ ("delta", None),
+ ("echo", LSToken.CITY_NAME),
+ ("foxtrot", LSToken.CITY_NAME),
+ ],
+ ["a target", "another target", "alpha bravo charlie delta", "alpha charlie"],
+ LSToken.STATE_NAME,
+ 3,
+ [
+ ("alpha", None),
+ ("bravo", None),
+ ("charlie", None),
+ ("delta", None),
+ ("echo", LSToken.CITY_NAME),
+ ("foxtrot", LSToken.CITY_NAME),
+ ],
+ id="four_word_match_with_three_word_limit"
+ ),
+ ]
+ )
+ def test_merge_multiword_tokens(self, tokens, target_list, merged_token_type, max_words, results):
+ """
+ GIVEN:
+ WHEN:
+ THEN:
+ """
+ token_list = [LSToken(x[0], token_type=x[1]) for x in tokens]
+ sequence = LSTokenSequence(token_list)
+ sequence.merge_multiword_tokens(
+ target_list=target_list,
+ merged_token_type=merged_token_type,
+ max_words=max_words
+ )
+ for n in range(len(results)):
+ assert sequence.tokens[n].value == results[n][0]
+ assert sequence.tokens[n].type == results[n][1]
+
+ @pytest.mark.parametrize(
+ "tokens,results",
+ [
+ pytest.param(
+ [("new", None), ("york", None)],
+ [("new york", LSToken.STATE_NAME)],
+ id="simple"
+ ),
+ pytest.param(
+ [("alpha", None), ("bravo", None), ("new", None), ("mexico", None), ("charlie", None)],
+ [("alpha", None), ("bravo", None), ("new mexico", LSToken.STATE_NAME), ("charlie", None)],
+ id="two_word_state_among_unclassified"
+ ),
+ pytest.param(
+ [("01230", LSToken.POSTCODE), ("district", None), ("of", None), ("columbia", None), ("alpha", None)],
+ [("01230", LSToken.POSTCODE), ("district of columbia", LSToken.STATE_NAME), ("alpha", None)],
+ id="three_word_state_in_partially_classified_group"
+ )
+ ]
+ )
+ def test_merge_multiword_statenames(self, tokens, results):
+ """
+ GIVEN: An instance of LSTokenSequence
+ WHEN: .merge_multiword_statenames() is called on that instance
+ THEN: Sequential, unclassified tokens which comprise a state name should be combined
+ into single tokens with the type LSToken.STATE_NAME, and a
+ modified copy of the input list returned.
+ """
+ token_list = [LSToken(x[0], token_type=x[1]) for x in tokens]
+ sequence = LSTokenSequence(token_list)
+ sequence.merge_multiword_statenames()
+ assert len(results) == len(sequence)
+ for n in range(len(results)):
+ assert sequence.tokens[n].value == results[n][0]
+ assert sequence.tokens[n].type == results[n][1]
+
+
+class TestLSQuery:
+ @pytest.mark.parametrize(
+ "input_string,result",
+ [
+ pytest.param("1234", False, id="too_short_four_digits"),
+ pytest.param("12345", True, id="five_digit_zip"),
+ pytest.param("123456", False, id="too_long_six_digits"),
+ pytest.param("123451234", True, id="nine_digit_zip4"),
+ pytest.param("1234512345", False, id="too_long_ten_digits"),
+ ]
+ )
+ def test_simple_postcode_re(self, input_string, result):
+ """
+ GIVEN: An input string
+ WHEN: That string is matched against LSQuery.SIMPLE_POSTCODE_RE
+ THEN: If the string is a 5 digit or 9 digit number, a match should return
+ """
+ assert bool(SIMPLE_POSTCODE_RE.match(input_string)) is result
+
+ def test_boolean_context(self):
+ """
+ GIVEN: A search_string that is None or not a string
+ WHEN: An attempt is made to instantiate a LSQuery object based on that search_string
+ THEN: The returned object should evaluate as False in a boolean context
+ """
+ assert not LSQuery(None)
+ assert not LSQuery(12345)
+ assert not LSQuery([1, 2, 3])
+ assert not LSQuery({"a": 1})
+ assert not LSQuery((1, 2, 3))
+
+ @pytest.mark.parametrize(
+ "search_string,tokens",
+ [
+ pytest.param("Alpha", ["alpha"]),
+ pytest.param("Alpha Bravo", ["alpha", "bravo"]),
+ pytest.param("Alpha, Bravo? Charlie!", ["alpha", "bravo", "charlie"]),
+ pytest.param("alpha 12345 54321-3232", ["alpha", "12345", "543213232"])
+ ]
+ )
+ def test_tokenize(self, search_string, tokens):
+ """
+ GIVEN: A search_string
+ WHEN: A LSQuery object is instantiated from that search_string
+ THEN: The following should be true:
+ * The .raw_string attribute should match the input string
+ * The .raw_tokens attribute should be a list of the space separated items in the input
+ * The .tokens attribute should be a list of the space separated items, less punctuation, lowercased
+ """
+ sq_obj = LSQuery(search_string)
+ assert sq_obj.raw_string == search_string[:(LSQuery.MAX_SEARCH_STRING_LEN * 3)]
+ assert sq_obj.tokens == [LSToken(t) for t in tokens]
+
+ @pytest.mark.parametrize(
+ "search_string,result",
+ [
+ pytest.param("Alpha \n Bravo \t Charlie", "Alpha Bravo Charlie", id="extra_whitespace"),
+ pytest.param(
+ ("ABCDE " * (math.floor(LSQuery.MAX_SEARCH_STRING_LEN / len("ABCDE ")) + 2)).strip(),
+ ("ABCDE " * math.floor(LSQuery.MAX_SEARCH_STRING_LEN / len("ABCDE "))).strip(),
+ id="longer_than_max_len"
+ ),
+ pytest.param(
+ "X" * (LSQuery.MAX_SEARCH_STRING_LEN - 2) + ' XXXXX',
+ "X" * (LSQuery.MAX_SEARCH_STRING_LEN - 2),
+ id="partial_token"
+ ),
+ pytest.param("Jonestown Memorial Libary", "Jonestown Memorial library", id="common_mistake"),
+ pytest.param(1234, '', id="numeric_input"),
+ pytest.param(["a", "b"], '', id="list_input"),
+ pytest.param(None, '', id="none_input"),
+ ]
+ )
+ def test__normalize_search_string(self, search_string, result):
+ """
+ GIVEN: An input string
+ WHEN: LSQuery._normalize_search_string() is called on that string
+ THEN: A string should be returned which meets these criteria:
+ * Extraneous whitespace characters converted to single spaces
+ * Total length below LSQuery.MAX_SEARCH_STRING_LEN
+ * If truncating to fewer total characters than MAX_SEARCH_STRING_LEN,
+ the string should not end in a partial word.
+ """
+ assert LSQuery._normalize_search_string(search_string) == result
+
+ @pytest.mark.skip
+ @pytest.mark.parametrize(
+ "search_string,search_type",
+ [
+ pytest.param("11212", LSQuery.GEOTARGET_SINGLE, id="zipcode_11212"),
+ ]
+ )
+ def test__search_type(self, search_string, search_type):
+ sq_obj = LSQuery(search_string)
+ assert sq_obj._search_type() == search_type
+
+
+class TestLSBaseTokenClassifier:
+ def test_classify_tokens_abstract(self):
+ """
+ GIVEN: No preconditions
+ WHEN: LSTokenClassifier.classify_tokens() is called
+ THEN: A NotImplementedError exception should be raised
+ """
+ with pytest.raises(NotImplementedError):
+ LSBaseTokenClassifier.classify_tokens(None)
+
+ def test_work_to_do_abstract(self):
+ """
+ GIVEN: No preconditions
+ WHEN: LSTokenClassifier.work_to_do() is called
+ THEN: A NotImplementedError exception should be raised
+ """
+ with pytest.raises(NotImplementedError):
+ LSBaseTokenClassifier.work_to_do(None)
diff --git a/util/geo.py b/util/geo.py
new file mode 100644
index 00000000..13edb88a
--- /dev/null
+++ b/util/geo.py
@@ -0,0 +1,188 @@
+import re
+
+
+# Regex for extracting latitude and longitude from a string like "10.1234, 110.1234"
+LATLONG_STRING_REGEX = re.compile(r"""^ # Start of string
+ (?P # latitude, capturing
+ -? # Optional leading negative sign
+ (?: # Lat. before decimal, non-capturing
+ 90 | # Double digit 90
+ [1-8][0-9] | # Double digit 10-89
+ [0-9] # Single digit 0-9
+ )
+ (?: # Latitude decimal portion, non-capturing
+ \. # Decimal separator
+ [0-9]{1,} # One or more digits of precision
+ )? # Precision digits/decimal are optional
+ )
+ [, ]{1} # A single comma or space, to separate lat/long
+ [ ]{0,} # Optional additional spaces
+ (?P
+ -? # Optional leading negative sign
+ (?:
+ 180 | # triple digit 180
+ 1[0-7][0-9] | # triple digit 100-179
+ [1-9][0-9] | # double digit 10-99
+ [0-9] # single digit 0-9
+ )
+ (?: # Longitude decimal portion, non-capturing
+ \. # Decimal separator
+ [0-9]{1,} # One or more digits of precision
+ )? # Precision digits/decimal are optional
+ )
+ """, re.VERBOSE)
+
+# Regex for extracting srid, latitude, and longitude from:
+# * A Well-Known Text string like "POINT(110.1234 10.1234)"
+# * An Extended Well-Known Text string like "SRID=1234;POINT(110.1234 10.1234)"
+LATLONG_WKT_EWKT_REGEX = re.compile(r"""^
+ (?:
+ SRID=(?P[0-9]{1,}); # If this is EWKT, starts with SRID
+ )? # However, this is entirely optional
+ POINT\(
+ (?P
+ -?(?: 180 | 1[0-7][0-9] | [1-9][0-9] | [0-9])
+ (?: \. [0-9]{1,})?
+ )
+ [ ]{1}
+ (?P
+ -?(?: 90 | [1-8][0-9] | [0-9])
+ (?: \. [0-9]{1,})?
+ )
+ \)$
+ """, flags=re.VERBOSE | re.IGNORECASE)
+
+
+class InvalidLocationException(Exception):
+ """Raised when a Location is created with invalid input"""
+
+
+class Location:
+ """A Location represents a point on the earth."""
+ def __init__(self, location):
+ (self.latitude, self.longitude, self.srid) = self.normalize_location_input(location)
+
+ if not (self.latitude and self.longitude):
+ raise InvalidLocationException(f"Could not create a Location from input: {location}")
+
+ if not self.srid:
+ self.srid = 4326
+
+ self.in_ocean = self.location_in_ocean(location)
+ self.wkt = f"POINT({self.longitude} {self.latitude})"
+ self.ewkt = f"SRID={self.srid};{self.wkt}"
+
+ def __str__(self):
+ return self.ewkt
+
+ def __repr__(self):
+ return f""
+
+ def __eq__(self, other):
+ """
+ Locations are considered equal for our purposes if their latitude and longitude
+ match to 6 digits of precision.
+ """
+ if not isinstance(other, Location):
+ return False
+
+ if (
+ round(self.latitude, 6) == round(other.latitude, 6) and
+ round(self.longitude, 6) == round(other.longitude, 6)
+ ):
+ return True
+ else:
+ return False
+
+ @classmethod
+ def normalize_location_input(cls, location):
+ """
+ Convert any of several formats to a 3-tuple of (latitude, longitude, srid), where
+ * latitude and longitude are floats
+ * srid is an integer or None
+
+ location may be any one of:
+
+ - A 2-tuple of (latitude, longitude)
+ - A 3-tuple of (latitude, longitude, srid)
+ - A comma and/or space separated string with 'latitude, longitude'
+ - A Well Known Text string of type Point, such as 'POINT(longitude latitude)'
+ - An Extended WKT string of type Point, such as 'SRID=4326;POINT(longitude latitude)'
+ """
+ (latitude, longitude, srid) = (None, None, None)
+
+ if isinstance(location, tuple):
+ if len(location) == 2:
+ (latitude, longitude) = location
+ elif len(location) == 3:
+ (latitude, longitude, srid) = location
+ elif isinstance(location, str):
+ if ',' in location or (' ' in location and not location.upper().startswith(('POINT', 'SRID'))):
+ # If it's got a comma, or doesn't start with POINT or SRID, it's not a WKT/EWKT Point string
+ match = LATLONG_STRING_REGEX.match(location)
+ if match:
+ latitude = match.group('latitude')
+ longitude = match.group('longitude')
+ elif location.upper().startswith(('POINT', 'SRID')): # it's a WKT/EWKT string
+ match = LATLONG_WKT_EWKT_REGEX.match(location)
+ if match:
+ srid = match.groupdict()['srid']
+ latitude = match.group('latitude')
+ longitude = match.group('longitude')
+
+ # Perform type coercion on the values we got
+ try:
+ latitude = float(latitude)
+ assert abs(latitude) <= 90.0
+ longitude = float(longitude)
+ assert abs(longitude) <= 180.0
+ except (TypeError, ValueError, AssertionError):
+ (latitude, longitude) = (None, None) # These live or die together. No sense returning only one.
+
+ try:
+ assert (latitude and longitude) # If lat/long didn't pass, srid doesn't matter
+ assert str(srid) == str(int(srid)) # srid has to be a real int, even if it's in a string
+ srid = int(srid)
+ except (TypeError, ValueError, AssertionError):
+ srid = None
+
+ # At this point either we've got real values from the tuple or string, or the location
+ # passed in wasn't a string or a tuple, so we can safely ignore it and return nothing.
+ return (latitude, longitude, srid)
+
+ @classmethod
+ def location_in_ocean(cls, location):
+ """
+ Roughly confirm that a location is in the ocean.
+
+ Checks to make sure the values are in bounds for their type, then does a very
+ rough check for whether they're in some very big boxes in the middle of the ocean.
+ """
+ (latitude, longitude, _) = cls.normalize_location_input(location) # We don't really care about the SRID
+
+ if not (latitude and longitude):
+ return False
+
+ ocean_boxes = [
+ {"lat": (-12.35, 50.25), "lon": (-151.27, -129.95)}, # Pacific 1, CA to HI # noqa: E201
+ {"lat": (-24.44, 14.62), "lon": (-146.73, -94.48)}, # Pacific 2, south of Mexico # noqa: E201
+ {"lat": ( -9.35, 50.98), "lon": (-180.0, -162.44)}, # Pacific 3: west of HI # noqa: E201
+ {"lat": ( -1.48, 41.61), "lon": ( 145.66, 180.00)}, # Pacific 4: West of Int. Dateline # noqa: E201
+ {"lat": (-64.47, -35.54), "lon": ( 73.84, 135.41)}, # Pacific 5: Australia to Antarctica # noqa: E201
+ {"lat": ( 2.33, 27.57), "lon": ( 129.39, 145.66)}, # Phillipine Sea # noqa: E201
+ {"lat": ( -7.83, 16.89), "lon": ( 82.89, 94.09)}, # Bay of Bengal # noqa: E201
+ {"lat": (-47.83, 5.45), "lon": ( 51.07, 94.53)}, # Indian Ocean # noqa: E201
+ {"lat": (-18.17, 14.22), "lon": ( 55.71, 72.32)}, # Arabian Sea # noqa: E201
+ {"lat": (-70.54, -18.42), "lon": (-180.0, -116.75)}, # Southern Ocean # noqa: E201
+ {"lat": (-66.11, 2.22), "lon": ( -33.89, 7.24)}, # South Atlantic # noqa: E201
+ {"lat": ( 40.87, 56.60), "lon": ( -51.67, -10.17)}, # North Atlantic 1, Canada to UK # noqa: E201
+ {"lat": ( 18.69, 42.81), "lon": ( -65.21, -18.94)}, # North Atlantic 2, PR to W. Africa # noqa: E201
+ {"lat": ( 22.78, 28.69), "lon": ( -96.44, -84.44)}, # Gulf of Mexico # noqa: E201
+ ]
+
+ for bounds in ocean_boxes:
+ (lat, lon) = (bounds["lat"], bounds["lon"])
+ if (lat[0] < latitude < lat[1]) and (lon[0] < longitude < lon[1]):
+ return True # The point the inputs describe is in the middle of the ocean.
+
+ return False
diff --git a/util/search.py b/util/search.py
new file mode 100644
index 00000000..e12482e7
--- /dev/null
+++ b/util/search.py
@@ -0,0 +1,743 @@
+"""
+Classes and methods related to searching for Libraries.
+
+Class names prefixed with LS for 'Library Search'.
+"""
+import copy
+import re
+import string
+
+from sqlalchemy import func
+from sqlalchemy.sql.expression import or_
+
+from constants import (
+ LIBRARY_KEYWORDS,
+ MULTI_WORD_STATE_NAMES,
+ US_STATE_ABBREVIATIONS,
+ US_STATE_NAMES,
+)
+from util.geo import InvalidLocationException, Location
+
+
+SIMPLE_POSTCODE_RE = re.compile(r'''^(?:[0-9]{5}|[0-9]{9})$''') # 5 or 9 digits
+
+
+class InvalidLSToken(Exception):
+ """Raised when an LSToken is created from a bad value"""
+
+
+class LSToken:
+ """
+ Object representing a single token in a user-submitted search for Libraries.
+
+ Notes:
+
+ * An LSToken's .value may be comprised of more than one word. For instance, a single
+ token of type STATE_NAME could have the value "new york".
+ * LSToken instances are fairly inert containers, mostly meant to allow classifying
+ a single- or multi-word string with a meaningful token type.
+ """
+ ##### Class Constants #################################################### # noqa: E266
+
+ # Token Types
+ POSTCODE = "postcode" # noqa: E221
+ STATE_ABBR = "state_abbr" # noqa: E221
+ STATE_NAME = "state_name" # noqa: E221
+ COUNTY_NAME = "county_name" # noqa: E221
+ CITY_NAME = "city_name" # noqa: E221
+ LIBRARY_KEYWORD = "library_keyword" # noqa: E221
+ LIBRARY_NAME = "library_name" # noqa: E221
+
+ VALID_TOKEN_TYPES = [
+ POSTCODE,
+ STATE_ABBR,
+ STATE_NAME,
+ COUNTY_NAME,
+ CITY_NAME,
+ LIBRARY_KEYWORD,
+ LIBRARY_NAME,
+ ]
+
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
+ def __init__(self, token_string, token_type=None):
+ if not isinstance(token_string, str):
+ raise InvalidLSToken(f"Cannot create an LSToken with a value of '{token_string}'")
+
+ self.value = " ".join(token_string.strip().split())
+ self.type = token_type if token_type in self.VALID_TOKEN_TYPES else None
+
+ def __str__(self):
+ return str(self.value)
+
+ def __repr__(self):
+ return f""
+
+ def __eq__(self, other):
+ return True if self.value == other.value else False
+
+ ##### Private Methods #################################################### # noqa: E266
+
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+ @property
+ def is_multiword(self):
+ return bool(' ' in self.value)
+
+ ##### Class Methods ###################################################### # noqa: E266
+
+ ##### Private Class Methods ############################################## # noqa: E266
+
+
+class LSTokenSequence:
+ """A sequence of LSToken objects"""
+ ##### Class Constants #################################################### # noqa: E266
+
+ # When searching for and combining single-word search tokens into multi-word tokens (as in
+ # ["district", "of", "columbia"] ==> ["district of columbia"]), this is the maximum number
+ # of single tokens that merge_multiword_tokens() will attempt to scan, no matter what is
+ # passed in as the 'max_words' parameter.
+ MAX_MULTIWORD_TOKEN_LEN = 5
+
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
+ def __init__(self, tokens):
+ self.tokens = []
+
+ for token in tokens:
+ if not isinstance(token, LSToken):
+ token = LSToken(token)
+
+ self.tokens.append(token)
+
+ def __str__(self):
+ return ' '.join([t.value for t in self.tokens])
+
+ def __len__(self):
+ return len(self.tokens)
+
+ def unclassified_run_before_idx(self, idx_position):
+ """Returns a list of the consecutive unclassified tokens immediately prior to idx_position"""
+ n_tokens = len(self)
+ output = []
+
+ if idx_position == 0 or n_tokens == 1 or self.all_classified: # Nothing to look for
+ return output
+
+ return output
+
+ def unclassified_run_after_idx(self, idx_position):
+ """Returns a list of the consecutive unclassified tokens immediately following idx_position"""
+
+ def merge_multiword_tokens(self, target_list, merged_token_type, max_words=3):
+ """
+ Given a list of multi-word string targets, identify and merge sequential, unclassified
+ tokens in the current LSTokenSequence which, when joined by spaces, appear in the list
+ of target strings.
+
+ Alters the current object's .tokens list in place.
+
+ Parameters:
+
+ target_list - iterable of single-space separated strings to match
+ multi-word token runs against
+
+ merged_token_type - a token type constant from LSToken, which
+ will be used as the type of any token created
+
+ max_words - integer, the maximum number of single tokens which
+ should be combined to form a possible multi-word token.
+ Note that this is ignored if higher than the
+ LSQuery.MAX_MULTIWORD_TOKEN_LEN constant,
+ or if lower than 2.
+
+ Notes:
+
+ * This is a complicated function. It would be nice to decompose it if possible,
+ but I'm having trouble doing so in this initial pass (2021-05-28). As a temporary
+ compromise I'm adding a bunch of documentation to it. --Nick B.
+
+ * The match process proceeds as follows:
+
+ 1. Go to the first token in the input list which
+ a. is itself unclassified (has a .type of None) and
+ b. is immediately followed by another unclassified token
+ 2. Starting with this token and the one following, join the values with a space
+ 3. Check that compound word against the strings in the target list.
+ 4. If that compound word is in the target list:
+ a. create a new LSToken with the compound word, typed to merged_token_type
+ b. add that token into the output list in place of the original two tokens
+ c. skip over the next token, which has now been consumed by the compound
+ d. go to the next token in the list that satisfies step 1.
+ 5. If the 2-word token is not in the target list, try 3, 4, 5 word tokens stemmed
+ from the current token, if there is a run of unclassified tokens to support that.
+ 6. If any of those match (with the number of tokens forming a compound being limited
+ by the max_words parameter and associated constants), follow the procedure in 4.
+ 7. If no compound word stemmed off the current token matched a target, add the
+ current token to the output list as-is, and proceed to the next token satisfying 1.
+
+ * A single unclassified input token will never be merged into more than a single compound token.
+ Consequently, if a target list included both "alpha bravo" and "alpha bravo charlie", and the
+ input included an unclassified run of "alpha", "bravo", "charlie", the output would be a list of
+ two tokens, "alpha bravo" and "charlie".
+ """
+ # Step 1: Find out if we can exit this function without doing expensive work.
+ if self.all_classified or self.longest_unclassified_run <= 1:
+ return self.tokens # Everything is classified or no multi-word runs are possible
+
+ # Step 2: Make sure the maxiumum number of tokens used to form a compound word is in bounds,
+ # between 2 and the maximum number allowed by the class constant MAX_MULTIWORD_TOKEN_LEN,
+ # or the length ceiling imposed by the longest run of unclassified tokens in the input list.
+ min_multiword_tokens = 2
+ max_multiword_tokens = min(self.longest_unclassified_run, self.MAX_MULTIWORD_TOKEN_LEN)
+ max_words = min(max(max_words, min_multiword_tokens), max_multiword_tokens)
+
+ # Step 3: Narrow to unique targets which can be matched by the unclassified runs in this token list.
+ usable_targets = set([x for x in target_list if len(x.split(' ')) <= self.longest_unclassified_run])
+
+ if not usable_targets:
+ return self.tokens # Nothing short enough to match against, no work to do.
+
+ # Step 4: Set up some local variables.
+ total_token_count = len(self.tokens) # total number of tokens we have to work with
+ new_tokens = [] # the list we will eventually output
+ skip_next = 0 # counter to skip past tokens already merged
+
+ # Step 5: Iterate through the tokens, looking for runs to merge based on the target list.
+ for (token_idx, token_obj) in enumerate(self.tokens):
+ # Find out if we can jump to the next token without doing anything expensive.
+ if skip_next > 0: # skipping tokens merged by a previous iteration, and
+ skip_next = skip_next - 1 # excluding them from output by not appending to new_tokens
+ continue
+ elif (
+ token_obj.type or # this token is already classified
+ token_idx == (total_token_count - 1) or # last token in list, can't start a multi-word
+ self.tokens[token_idx + 1].type is not None # next token already classified, can't start multi-word
+ ):
+ new_tokens.append(token_obj) # make sure they go into the output list if they can't be merged
+ continue # then go to the next iteration
+
+ # We couldn't skip ahead based on the current token object, so let's find out if we're too
+ # close to the end of the list to do any more useful word stemming.
+ n_tokens_left = total_token_count - token_idx # tokens from here to the end of the list
+
+ if n_tokens_left < min_multiword_tokens: # not enough tokens left for a min length multi-word
+ new_tokens = new_tokens + self.tokens[token_idx:] # add the remainder of the list to the output
+ break # and stop iterating the tokens list
+
+ # Find the max number of words in a row we can potentially merge, starting with the current token.
+ loop_local_max_words = min(max_words, n_tokens_left) # Don't run off the end of the list making compounds
+
+ # if we got here, this token and the next are unclassified--lets look ahead further for a max run size
+ loop_local_unclassified_run = 2
+ for lookahead_token in self.tokens[(token_idx + 2):(token_idx+loop_local_max_words)]:
+ if lookahead_token.type is not None:
+ break
+ else:
+ loop_local_unclassified_run = loop_local_unclassified_run + 1
+
+ loop_local_max_words = min(loop_local_max_words, loop_local_unclassified_run)
+
+ # We got here, so we'll actually generate and check compound words starting at this index position.
+ for num_words in range(min_multiword_tokens, loop_local_max_words + 1):
+ slice_start = token_idx
+ slice_end = token_idx + num_words
+ compound_word = ' '.join([x.value for x in self.tokens[slice_start:slice_end]])
+
+ if compound_word in usable_targets: # We got a match!
+ new_tokens.append(LSToken(compound_word, token_type=merged_token_type))
+ skip_next = num_words - 1 # Skip the next N-1 tokens, that are now merged
+ break # with the current token_obj.
+
+ if skip_next == 0: # If we got here, no compound word stemmed from the current token
+ new_tokens.append(token_obj) # matched, so we put the current token into the output as a singleton.
+
+ self.tokens = new_tokens
+ return self
+
+ def merge_multiword_statenames(self):
+ """
+ For the current object's .tokens list, combine any runs of unclassified tokens that form a state name.
+
+ Convenience function built on top of merge_multiword_tokens().
+ """
+ max_tokens_in_state_names = max([len(x.split(' ')) for x in MULTI_WORD_STATE_NAMES])
+ return self.merge_multiword_tokens(
+ target_list=MULTI_WORD_STATE_NAMES,
+ merged_token_type=LSToken.STATE_NAME,
+ max_words=max_tokens_in_state_names
+ )
+
+ ##### Private Methods #################################################### # noqa: E266
+
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+ @property
+ def all_classified(self):
+ return all(bool(token.type is not None) for token in self.tokens)
+
+ @property
+ def unclassified_count(self):
+ return len(list(filter(lambda x: x.type is None, self.tokens)))
+
+ @property
+ def longest_unclassified_run(self):
+ if self.all_classified:
+ return 0
+
+ (current_run, max_run) = (0, 0)
+ for token in self.tokens:
+ current_run = current_run + 1 if not token.type else 0
+ max_run = max(current_run, max_run)
+ return max_run
+
+ ##### Class Methods ###################################################### # noqa: E266
+
+ ##### Private Class Methods ############################################## # noqa: E266
+
+
+class LSBaseTokenClassifier:
+ """
+ Abstract base class, subclassed to represent a meaningful pattern within a sequence of tokens.
+
+ When run on a sequence of tokens, it returns a copy which may be augmented by (re-)classifying
+ tokens, merging tokens, etc., based on the pattern the instance describes.
+ """
+ @classmethod
+ def classify(cls, tokens=None):
+ """ABSTRACT: Return an augmented copy of the token list"""
+ raise NotImplementedError("LSTokenClassifier.classify_tokens() is abstract")
+
+ @classmethod
+ def work_to_do(cls, tokens=None):
+ """ABSTRACT: Return a boolean indicating whether there is work to do in this list"""
+ raise NotImplementedError("LSTokenClassifier.work_to_do() is abstract")
+
+
+class LSSinglewordTokenClassifier(LSBaseTokenClassifier):
+ """Attempts to classify single-word tokens."""
+ @classmethod
+ def work_to_do(cls, token_sequence):
+ if token_sequence.all_classified:
+ return False
+ else:
+ return True
+
+ @classmethod
+ def classify(cls, token_sequence):
+ """
+ For a given string token, attempt to classify it as a specific type.
+
+ Note that this function should ONLY be used for types that can be associated with
+ a single word.
+ """
+ augmented = copy.deepcopy(token_sequence)
+
+ for token_obj in augmented:
+ if token_obj.type is not None or token_obj.is_multiword:
+ continue
+ elif SIMPLE_POSTCODE_RE.match(token_obj.value):
+ token_obj.type = LSToken.POSTCODE
+ elif token_obj.value in US_STATE_ABBREVIATIONS:
+ token_obj.type = LSToken.STATE_ABBR
+ elif token_obj.value in US_STATE_NAMES:
+ token_obj.type = LSToken.STATE_NAME
+ elif token_obj.value in LIBRARY_KEYWORDS:
+ token_obj.type = cls.LIBRARY_KEYWORD
+
+ return augmented
+
+
+class LSCitynameTokenClassifier(LSBaseTokenClassifier):
+ """Attempts to classify tokens representing the name of a City"""
+ STATE_TOKEN_TYPES = [LSToken.STATE_ABBR, LSToken.STATE_NAME]
+
+ @classmethod
+ def work_to_do(cls, tokens):
+ if len(tokens) >= 1 or cls.all_classified(tokens):
+ return False # No work possible if there's only one token, or all tokens already classified
+
+ tokens_as_string = " ".join([token_obj.value for token_obj in tokens])
+
+ # If any of these conditions are true, there might be work, worth proceeding
+ if (
+ 'city' in tokens_as_string or # Bare-word 'city' in tokens
+ any([x.type in cls.STATE_TOKEN_TYPES for x in tokens]) # A state name or abbreviation appears
+ ):
+ return True
+ else:
+ return False
+
+ @classmethod
+ def classify(cls, tokens):
+ """
+ Patterns that may indicate a city name:
+
+ * If a state name or abbreviation follows 1+ unclassified tokens
+ * If there is an unclassified token whose value is 'city', with unclassified
+ tokens before it
+ * If there are two unclassified tokens 'city' 'of' in sequence, with unclassified
+ tokens after them
+ """
+ if not cls.work_to_do(tokens):
+ return tokens
+
+ tokens_as_string = " ".join([token_obj.value for token_obj in tokens])
+ augmented = copy.deepcopy(tokens)
+ tokens_len = len(tokens)
+
+ if 'city of' in tokens_as_string: # Pattern 1: Bare words 'city of' in tokens
+ for (token_idx, token_obj) in enumerate(tokens[:-2]):
+ if (
+ token_obj.value == 'city' and # 'city', followed by
+ tokens[token_idx+1].value == 'of' # 'of', followed by
+ and not tokens[token_idx+2].type # at least one unclassified token
+ ):
+ compound_word = tokens[(token_idx+2)].value
+ next_token_idx = token_idx + 3
+ while next_token_idx < tokens_len and tokens[next_token_idx].type is None:
+ compound_word = compound_word + ' ' + tokens[next_token_idx]
+ next_token_idx = next_token_idx + 1
+
+ elif 'city' in tokens_as_string: # Pattern 2: Bare word 'city' in tokens
+ ...
+
+
+class LSCountynameTokenClassifier(LSBaseTokenClassifier):
+ """Attempts to classify tokens representing the name of a County"""
+ @classmethod
+ def classify(cls, tokens):
+ """
+ Patterns that probably indicate a county name:
+
+ * If there is an unclassified token whose value is 'county', following 1+
+ unclassified tokens
+ """
+ return tokens
+
+
+class LSLibrarynameTokenClassifier(LSBaseTokenClassifier):
+ """Attempts to classify tokens representing the name of a Library"""
+ @classmethod
+ def classify(cls, tokens):
+ """
+ Patterns that probably indicate a Library name:
+
+ * If there is at least 1 token of type LIBRARY_KEYWORD
+ """
+ return tokens
+
+
+class LSQuery:
+ """Object representing a user-submitted search for Libraries"""
+ ##### Class Constants #################################################### # noqa: E266
+
+ # A list of search typos that are common enough that we just want to correct them
+ # during normalization. The first term is the mistaken version, the second is what it
+ # will be corrected to. Please note that as currently written, these can only be single
+ # words. To fix a multi-word mistake you will need to alter _normalize_search_string().
+ COMMON_MISTAKES = [
+ ("libary", "library"),
+ ]
+
+ # The longest (post-normalization) search string we will consider. During normalization
+ # a user-submitted search string will be truncated to this length (or slightly shorter
+ # if the full length breaks in the middle of a token).
+ MAX_SEARCH_STRING_LEN = 128
+
+ # When searching for and combining single-word search tokens into multi-word tokens (as in
+ # ["district", "of", "columbia"] ==> ["district of columbia"]), this is the maximum number
+ # of single tokens that _merge_multiword_tokens() will attempt to scan, no matter what is
+ # passed in as the 'max_words' parameter.
+ MAX_MULTIWORD_TOKEN_LEN = 5
+
+ # Search types, used to classify what kind of search we'll perform.
+ GEOTARGET_SINGLE = "geotarget_single"
+ GEOTARGET_MULTIPLE = "geotarget_multiple"
+ LIBTARGET = "libtarget"
+
+ ##### Public Interface / Magic Methods ################################### # noqa: E266
+ def __init__(self, raw_search_string, location=None):
+ if isinstance(raw_search_string, str):
+ self.raw_string = raw_search_string[:(self.MAX_SEARCH_STRING_LEN * 3)]
+ else:
+ self.raw_string = ''
+
+ self.normalized_string = self._normalize_search_string(raw_search_string)
+ self.cleaned_string = self.normalized_string.translate(str.maketrans('', '', string.punctuation)).lower()
+ self.tokens = self._tokenize(self.cleaned_string)
+
+ if location and not isinstance(location, Location):
+ try:
+ location = Location(location)
+ except InvalidLocationException:
+ location = None
+
+ self.location = location
+ self.search_type = self._search_type()
+
+ def __bool__(self):
+ return False if self.raw_string == '' else True
+
+ def __str__(self):
+ return self.normalized_string
+
+ def run(self):
+ """
+ Return between 3 and 20 Libraries which best correspond to a given combination of user
+ location and user-provided, textual search term(s). May return 0 Libraries in response
+ to an invalid searchterm paired with an unknown location.
+
+ Terminology:
+
+ LOCATION - The user's actual location, which we may or may not know.
+ For discussion purposes may be 'unknown' or 'known'.
+ SEARCHTERM - The user-provided, textual search term(s).
+ GEOTARGET - A geographic place/polygon derived from SEARCHTERM.
+ Valid types are 'postcode', 'city', 'county', 'state', 'nation', or 'everywhere'
+ LIBTARGET - A Library derived from SEARCHTERM
+ LIB_LOCAL - The local Library for a given GEOTARGET. Defined as a Library whose
+ focus area is based on a postcode, city, or county, whose point-based
+ location is the least distance from a polygon edge of the GEOTARGET.
+ LIB_SUPRA - A supra-local Library for a given GEOTARGET. Defined as a Library
+ whose focus area is based on a state, or is everywhere, whose point-based
+ location is the least distance from a polygon edge of the GEOTARGET.
+ FOCUS_AREA - The area a Library focuses its efforts on. Defined as one or more
+ geographic places/polygons.
+ RESULT_1 - The first Library in the returned result set
+ RESULT_2 - The second Library in the returned result set
+ RESULT_3 - The third Library in the returned result set
+ RESULT_N - Some Library in the result set beyond RESULT_3
+
+ Here are the criteria we use to determine the 'best' results for a request:
+
+ 1. Parse the submitted SEARCHTERM:
+ - Assume SEARCHTERM refers to GEOTARGET(s) or LIBTARGET(s), but not both
+ - Attempt to use the parsed SEARCHTERM to identify GEOTARGET(s)
+ - Prioritize matching on postcode, city name, state name
+ - Failing that, attempt to identify LIBTARGET(s)
+ - Attempt fuzzy string matching on name, alias, description
+ 2. If we decide that SEARCHTERM references a single GEOTARGET:
+ - LOCATION is ignored
+ - Only 3 Libraries will be returned
+ - Only Libraries whose FOCUS_AREA is within 300km of GEOTARGET are considered
+ a. If GEOTARGET is a postcode, city, or county
+ - RESULT_1 should be LIB_LOCAL, or empty if no LIB_LOCAL exists for GEOTARGET
+ - RESULT_2 should be closest LIB_SUPRA
+ - RESULT_3 is closest local Library that is not LIB_LOCAL or next closest LIB_SUPRA
+ b. If GEOTARGET is a state
+ - TBD
+ c. If GEOTARGET is a nation
+ - TBD
+ 3. If we decide that SEARCHTERM references multiple GEOTARGETs:
+ a. If LOCATION is known:
+ - Only 3 Libraries will be returned
+ - The single GEOTARGET of interest is the one closest to LOCATION
+ - Using that GEOTARGET, proceed as in item 2
+ b. If LOCATION is unknown:
+ - Up to 20 Libraries will be returned
+ - The pre-limit result set will be all Libraries in all of the GEOTARGETs
+ - RESULT_1 through RESULT_20 are the first 20 Libraries found for all the
+ referenced GEOTARGETs, ordered alphabetically
+ 4. If we decide that SEARCHTERM references a LIBTARGET:
+ a. If LOCATION is known:
+ - Only 3 Libraries will be returned
+ - RESULT_1 through RESULT_3 are Library name matches
+ - Results are ordered by ascending distance from LOCATION
+ b. If LOCATION is unknown:
+ - Up to 20 Libraries will be returned
+ - RESULT_1 through RESULT_N are Library name matches
+ - Results are ordered by name match type: Name, Alias, Description
+ 5. If we decide the SEARCHTERM is incapable of matching any GEOTARGET or LIBTARGET:
+ - We have nothing to go on, return an empty result set
+ """
+ if not self and not self.location: # No valid search or user location, nothing to do
+ return []
+
+ search_method = self._appropriate_search_method()
+
+ return search_method()
+
+ ##### Private Methods #################################################### # noqa: E266
+ def _search_type(self):
+ """
+ Returns one of the search type constants, like LSQuery.GEOTARGET_SINGLE.
+
+ Here is how we decide which search type to go with:
+
+ * If one-and-only-one token of the query is a postalcode, we return GEOTARGET_SINGLE
+ * If multiple tokens are postalcodes, we return GEOTARGET_MULTIPLE
+ * If a city or county name can be extracted from a query, we return GEOTARGET_SINGLE
+ * If a state name (but no city, county, or postcode) is present, we return GEOTARGET_SINGLE
+ """
+ search_type = None
+ return search_type
+
+ def _appropriate_search_method(self):
+ """
+ Based on the search string and user location (if any), return the search method
+ that best matches the overall decision tree for Library search.
+ """
+ if self.search_type == self.GEOTARGET_SINGLE:
+ search_method = self._search_single_geotarget
+
+ elif self.search_type == self.GEOTARGET_MULTIPLE:
+ if self.location:
+ search_method = self._search_multiple_geotargets_with_location
+ else:
+ search_method = self._search_multiple_geotargets_without_location
+
+ elif self.search_type == self.LIBTARGET:
+ if self.location:
+ search_method = self._search_libtargets_with_location
+ else:
+ search_method = self._search_libtargets_without_location
+
+ else:
+ search_method = lambda: [] # noqa: E731
+
+ return search_method
+
+ def _search_single_geotarget(self):
+ """
+ Search criteria once we determine the user is looking for a single geotarget:
+
+ * LOCATION is ignored
+ * Only 3 Libraries will be returned
+ * Only Libraries whose FOCUS_AREA is within 300km of GEOTARGET are considered
+ a. If GEOTARGET is a postcode, city, or county
+ * RESULT_1 should be LIB_LOCAL, or empty if no LIB_LOCAL exists for GEOTARGET
+ * RESULT_2 should be closest LIB_SUPRA
+ * RESULT_3 is closest local Library that is not LIB_LOCAL or next closest LIB_SUPRA
+ b. If GEOTARGET is a state
+ * TBD
+ c. If GEOTARGET is a nation
+ * TBD
+ """
+
+ def _search_multiple_geotargets_with_location(self):
+ pass
+
+ def _search_multiple_geotargets_without_location(self):
+ pass
+
+ def _search_libtargets_with_location(self):
+ pass
+
+ def _search_libtargets_without_location(self):
+ pass
+
+ ##### Properties and Getters/Setters ##################################### # noqa: E266
+
+ ##### Class Methods ###################################################### # noqa: E266
+ @classmethod
+ def fuzzy_match_clause(cls, field, value):
+ """Create a SQL clause that attempts a fuzzy match of the given
+ field against the given value.
+
+ If the field's value is less than six characters, we require
+ an exact (case-insensitive) match. Otherwise, we require a
+ Levenshtein distance of less than two between the field value and
+ the provided value.
+ """
+ is_long = func.length(field) >= 6
+ close_enough = func.levenshtein(func.lower(field), value) <= 2
+ long_value_is_approximate_match = (is_long & close_enough)
+ exact_match = field.ilike(value)
+ return or_(long_value_is_approximate_match, exact_match)
+
+ ##### Private Class Methods ############################################## # noqa: E266
+ @classmethod
+ def _normalize_search_string(cls, raw_search_string):
+ """
+ Normalize a raw search string by removing extraneous whitespace and limiting the total
+ size to LSQuery.MAX_SEARCH_STRING_LEN. Also makes sure that the truncated
+ version does not end in a partial word.
+ """
+ # Step 0: If we got bad input, don't bother with any of the normalization stuff
+ if (
+ not raw_search_string or
+ not isinstance(raw_search_string, str) or
+ raw_search_string == ''
+ ):
+ return ''
+
+ # Step 1: Truncate to 3x max length, to avoid doing anything expensive to a huge string
+ long_raw_search_string = raw_search_string[:(cls.MAX_SEARCH_STRING_LEN * 3)]
+
+ # Step 2: Normalize the whitespace to single spaces and tokenize to single words
+ long_raw_search_string = ' '.join(long_raw_search_string.split())
+ long_raw_tokens = long_raw_search_string.split()
+
+ # Step 3: Create a version that's cut down to our actual maximum length
+ search_string = long_raw_search_string[:cls.MAX_SEARCH_STRING_LEN]
+ search_string_tokens = search_string.split()
+
+ # Step 4: Compare the last token of the one we just cut down to the same token
+ # in the tokenized version of the 3x long one. If they're different, we
+ # ended up with a partial word at the end, and we need to get rid of it.
+ if search_string_tokens[-1] != long_raw_tokens[len(search_string_tokens) - 1]:
+ search_string_tokens.pop()
+
+ # Step 5: Fix common mistakes.
+ lc_tokens = [token.lower() for token in search_string_tokens]
+ for (wrong, correct) in cls.COMMON_MISTAKES:
+ mistake_positions = [idx for (idx, token) in enumerate(lc_tokens) if token == wrong.lower()]
+ for pos in mistake_positions:
+ search_string_tokens[pos] = correct
+
+ return ' '.join(search_string_tokens)
+
+ @classmethod
+ def _tokenize(cls, normalized_search_string):
+ """
+ Return a list of LSToken objects created from words in a normalized search string.
+
+ A token is not always a single word, depending on how the query string is parsed. For instance,
+ using the query string "Los Angeles, California", we would want two tokens: "Los Angeles" and
+ "California."
+ """
+ words = [LSToken(word) for word in normalized_search_string.split()]
+ tokens = []
+
+ if len(words) == 1 or all([bool(word.type is not None) for word in words]):
+ # No multi-word tokens are possible if either a) there is only one word, or b) all
+ # of the words present have been successfully individually classified by
+ # LSToken.token_type() during the creation of that token instance.
+ tokens = words
+ else:
+ tokens = cls._merge_multiword_statenames(words)
+ tokens = cls._classify_tokens_by_pattern(tokens)
+
+ return tokens
+
+ @classmethod
+ def _max_consecutive_unclassified_run(self, token_list):
+ """Return a number representing the longest run of unclassified tokens in a list."""
+ if all(bool(token.type is not None) for token in token_list):
+ return 0
+
+ current_run = 0
+ max_run = 0
+ for token in token_list:
+ current_run = current_run + 1 if not token.type else 0
+ max_run = max(current_run, max_run)
+ return max_run
+
+ @classmethod
+ def _classify_tokens_by_pattern(cls, tokens):
+ """
+ For a list of LSToken objects, attempt to classify any unclassified
+ tokens based on patterns present in the list.
+
+ Notes:
+
+ * This function should run AFTER any calls to _merge_multiword_tokens()
+ (or its convenience functions) have been made. It relies on patterns
+ those functions establish, such as the presence of a state name.
+
+ Patterns looked for:
+
+ * A state name or abbreviation following 1+ unclassified tokens, assume CITY_NAME
+ * An unclassified token whose value is 'county', following 1+ unclassified tokens, assume COUNTY_NAME
+ * The presence of 1+ tokens of type LIBRARY_KEYWORD, assume LIBRARY_NAME
+ * An unclassified token whose value is 'city', assume CITY_NAME for preceding token(s)
+
+ """
+ return tokens