diff -Nru geomet-0.2.0.post2/AUTHORS.txt geomet-0.2.1.post1/AUTHORS.txt --- geomet-0.2.0.post2/AUTHORS.txt 1970-01-01 00:00:00.000000000 +0000 +++ geomet-0.2.1.post1/AUTHORS.txt 2020-01-27 11:00:26.000000000 +0000 @@ -0,0 +1,7 @@ +# Authors of GeoMet +# Name - Month Year +Lars Butler - March 2013 +Maralla - November 2013 +Sean Gillies - August 2014 +Tom Caruso - December 2018 +Paul Bryan - August 2019 diff -Nru geomet-0.2.0.post2/debian/changelog geomet-0.2.1.post1/debian/changelog --- geomet-0.2.0.post2/debian/changelog 2019-01-03 15:57:11.000000000 +0000 +++ geomet-0.2.1.post1/debian/changelog 2020-01-24 09:26:36.000000000 +0000 @@ -1,3 +1,12 @@ +geomet (0.2.1.post1-1) unstable; urgency=medium + + * Adding debian/watch. + * Updating to standards version 4.5.0. + * Updating year in copyright for 2020. + * Adding upstream version 0.2.1.post1. + + -- Simon Spöhel Fri, 24 Jan 2020 10:26:36 +0100 + geomet (0.2.0.post2-2) unstable; urgency=medium * Updating year in copyright for 2019. diff -Nru geomet-0.2.0.post2/debian/control geomet-0.2.1.post1/debian/control --- geomet-0.2.0.post2/debian/control 2019-01-03 15:47:24.000000000 +0000 +++ geomet-0.2.1.post1/debian/control 2020-01-24 09:26:36.000000000 +0000 @@ -10,7 +10,7 @@ python3-setuptools, python3-six, Rules-Requires-Root: no -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Homepage: https://github.com/geomet/geomet Vcs-Browser: https://salsa.debian.org/simon-guest/geomet Vcs-Git: https://salsa.debian.org/simon-guest/geomet.git diff -Nru geomet-0.2.0.post2/debian/copyright geomet-0.2.1.post1/debian/copyright --- geomet-0.2.0.post2/debian/copyright 2019-01-03 15:47:24.000000000 +0000 +++ geomet-0.2.1.post1/debian/copyright 2020-01-24 09:26:36.000000000 +0000 @@ -4,11 +4,11 @@ Source: https://pypi.python.org/pypi/geomet Files: * -Copyright: 2013-2017 Lars Butler +Copyright: 2013-2020 Lars Butler License: Apache-2.0 Files: debian/* -Copyright: 2018-2019 Simon Spöhel +Copyright: 2018-2020 Simon Spöhel License: Apache-2.0 License: Apache-2.0 diff -Nru geomet-0.2.0.post2/debian/watch geomet-0.2.1.post1/debian/watch --- geomet-0.2.0.post2/debian/watch 1970-01-01 00:00:00.000000000 +0000 +++ geomet-0.2.1.post1/debian/watch 2020-01-24 09:26:36.000000000 +0000 @@ -0,0 +1,2 @@ +version=4 +opts=pgpmode=auto https://pypi.org/project/geomet .*/geomet-(\d\S+)\.tar\.gz diff -Nru geomet-0.2.0.post2/geomet/__init__.py geomet-0.2.1.post1/geomet/__init__.py --- geomet-0.2.0.post2/geomet/__init__.py 2018-09-05 08:16:25.000000000 +0000 +++ geomet-0.2.1.post1/geomet/__init__.py 2020-01-27 11:00:26.000000000 +0000 @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -__version__ = '0.2.0-2' +__version__ = '0.2.1-1' class InvalidGeoJSONException(Exception): diff -Nru geomet-0.2.0.post2/geomet/util.py geomet-0.2.1.post1/geomet/util.py --- geomet-0.2.0.post2/geomet/util.py 2015-06-24 11:46:52.000000000 +0000 +++ geomet-0.2.1.post1/geomet/util.py 2020-01-27 11:00:26.000000000 +0000 @@ -11,9 +11,12 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -import collections import itertools import six +if six.PY2: + import collections +else: + import collections.abc as collections def block_splitter(data, block_size): diff -Nru geomet-0.2.0.post2/geomet/wkt.py geomet-0.2.1.post1/geomet/wkt.py --- geomet-0.2.0.post2/geomet/wkt.py 2017-10-05 12:25:04.000000000 +0000 +++ geomet-0.2.1.post1/geomet/wkt.py 2020-01-27 11:00:26.000000000 +0000 @@ -76,8 +76,7 @@ except KeyError: raise geomet.InvalidGeoJSONException('Invalid GeoJSON: %s' % obj) - fmt = '%%.%df' % decimals - result = exporter(obj, fmt) + result = exporter(obj, decimals) # Try to get the SRID from `meta.srid` meta_srid = obj.get('meta', {}).get('srid') # Also try to get it from `crs.properties.name`: @@ -175,25 +174,52 @@ raise ValueError("Unsupported geometry type '%s'" % geom_type) -def _dump_point(obj, fmt): +def _round_and_pad(value, decimals): + """ + Round the input value to `decimals` places, and pad with 0's + if the resulting value is less than `decimals`. + + :param value: + The value to round + :param decimals: + Number of decimals places which should be displayed after the rounding. + :return: + str of the rounded value + """ + if isinstance(value, int) and decimals != 0: + # if we get an int coordinate and we have a non-zero value for + # `decimals`, we want to create a float to pad out. + value = float(value) + + elif decimals == 0: + # if get a `decimals` value of 0, we want to return an int. + return repr(int(round(value, decimals))) + + rounded = repr(round(value, decimals)) + rounded += '0' * (decimals - len(rounded.split('.')[1])) + return rounded + + +def _dump_point(obj, decimals): """ Dump a GeoJSON-like Point object to WKT. :param dict obj: A GeoJSON-like `dict` representing a Point. - :param str fmt: - Format string which indicates the number of digits to display after the + :param int decimals: + int which indicates the number of digits to display after the decimal point when formatting coordinates. :returns: WKT representation of the input GeoJSON Point ``obj``. """ coords = obj['coordinates'] - pt = 'POINT (%s)' % ' '.join(fmt % c for c in coords) + pt = 'POINT (%s)' % ' '.join(_round_and_pad(c, decimals) + for c in coords) return pt -def _dump_linestring(obj, fmt): +def _dump_linestring(obj, decimals): """ Dump a GeoJSON-like LineString object to WKT. @@ -202,11 +228,12 @@ """ coords = obj['coordinates'] ls = 'LINESTRING (%s)' - ls %= ', '.join(' '.join(fmt % c for c in pt) for pt in coords) + ls %= ', '.join(' '.join(_round_and_pad(c, decimals) + for c in pt) for pt in coords) return ls -def _dump_polygon(obj, fmt): +def _dump_polygon(obj, decimals): """ Dump a GeoJSON-like Polygon object to WKT. @@ -215,14 +242,15 @@ """ coords = obj['coordinates'] poly = 'POLYGON (%s)' - rings = (', '.join(' '.join(fmt % c for c in pt) for pt in ring) + rings = (', '.join(' '.join(_round_and_pad(c, decimals) + for c in pt) for pt in ring) for ring in coords) rings = ('(%s)' % r for r in rings) poly %= ', '.join(rings) return poly -def _dump_multipoint(obj, fmt): +def _dump_multipoint(obj, decimals): """ Dump a GeoJSON-like MultiPoint object to WKT. @@ -231,14 +259,15 @@ """ coords = obj['coordinates'] mp = 'MULTIPOINT (%s)' - points = (' '.join(fmt % c for c in pt) for pt in coords) + points = (' '.join(_round_and_pad(c, decimals) + for c in pt) for pt in coords) # Add parens around each point. points = ('(%s)' % pt for pt in points) mp %= ', '.join(points) return mp -def _dump_multilinestring(obj, fmt): +def _dump_multilinestring(obj, decimals): """ Dump a GeoJSON-like MultiLineString object to WKT. @@ -247,13 +276,13 @@ """ coords = obj['coordinates'] mlls = 'MULTILINESTRING (%s)' - linestrs = ('(%s)' % ', '.join(' '.join(fmt % c for c in pt) - for pt in linestr) for linestr in coords) + linestrs = ('(%s)' % ', '.join(' '.join(_round_and_pad(c, decimals) + for c in pt) for pt in linestr) for linestr in coords) mlls %= ', '.join(ls for ls in linestrs) return mlls -def _dump_multipolygon(obj, fmt): +def _dump_multipolygon(obj, decimals): """ Dump a GeoJSON-like MultiPolygon object to WKT. @@ -273,7 +302,7 @@ # and wrap in parens '(%s)' % ', '.join( # join coordinate values of a vertex - ' '.join(fmt % c for c in pt) + ' '.join(_round_and_pad(c, decimals) for c in pt) for pt in ring) for ring in poly) for poly in coords) @@ -282,7 +311,7 @@ return mp -def _dump_geometrycollection(obj, fmt): +def _dump_geometrycollection(obj, decimals): """ Dump a GeoJSON-like GeometryCollection object to WKT. @@ -297,7 +326,7 @@ geoms_wkt = [] for geom in geoms: geom_type = geom['type'] - geoms_wkt.append(_dumps_registry.get(geom_type)(geom, fmt)) + geoms_wkt.append(_dumps_registry.get(geom_type)(geom, decimals)) gc %= ','.join(geoms_wkt) return gc diff -Nru geomet-0.2.0.post2/geomet.egg-info/PKG-INFO geomet-0.2.1.post1/geomet.egg-info/PKG-INFO --- geomet-0.2.0.post2/geomet.egg-info/PKG-INFO 2018-09-05 08:16:25.000000000 +0000 +++ geomet-0.2.1.post1/geomet.egg-info/PKG-INFO 2020-01-27 11:00:26.000000000 +0000 @@ -1,10 +1,10 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: geomet -Version: 0.2.0.post2 +Version: 0.2.1.post1 Summary: GeoJSON <-> WKT/WKB conversion utilities Home-page: https://github.com/geomet/geomet -Author: Lars Butler -Author-email: lars.butler@gmail.com +Maintainer: Lars Butler +Maintainer-email: lars.butler@gmail.com License: Apache 2.0 Description: GeoMet @@ -20,7 +20,9 @@ Classifier: Intended Audience :: Science/Research Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Topic :: Scientific/Engineering :: GIS +Requires-Python: >2.6, !=3.3.*, <4 diff -Nru geomet-0.2.0.post2/geomet.egg-info/SOURCES.txt geomet-0.2.1.post1/geomet.egg-info/SOURCES.txt --- geomet-0.2.0.post2/geomet.egg-info/SOURCES.txt 2018-09-05 08:16:25.000000000 +0000 +++ geomet-0.2.1.post1/geomet.egg-info/SOURCES.txt 2020-01-27 11:00:26.000000000 +0000 @@ -1,4 +1,12 @@ +AUTHORS.txt +LICENSE +README.md setup.py +./geomet/__init__.py +./geomet/tool.py +./geomet/util.py +./geomet/wkb.py +./geomet/wkt.py geomet/__init__.py geomet/tool.py geomet/util.py diff -Nru geomet-0.2.0.post2/LICENSE geomet-0.2.1.post1/LICENSE --- geomet-0.2.0.post2/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ geomet-0.2.1.post1/LICENSE 2020-01-27 11:00:26.000000000 +0000 @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff -Nru geomet-0.2.0.post2/PKG-INFO geomet-0.2.1.post1/PKG-INFO --- geomet-0.2.0.post2/PKG-INFO 2018-09-05 08:16:25.000000000 +0000 +++ geomet-0.2.1.post1/PKG-INFO 2020-01-27 11:00:26.000000000 +0000 @@ -1,10 +1,10 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: geomet -Version: 0.2.0.post2 +Version: 0.2.1.post1 Summary: GeoJSON <-> WKT/WKB conversion utilities Home-page: https://github.com/geomet/geomet -Author: Lars Butler -Author-email: lars.butler@gmail.com +Maintainer: Lars Butler +Maintainer-email: lars.butler@gmail.com License: Apache 2.0 Description: GeoMet @@ -20,7 +20,9 @@ Classifier: Intended Audience :: Science/Research Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.3 Classifier: Programming Language :: Python :: 3.4 Classifier: Programming Language :: Python :: 3.5 +Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 Classifier: Topic :: Scientific/Engineering :: GIS +Requires-Python: >2.6, !=3.3.*, <4 diff -Nru geomet-0.2.0.post2/README.md geomet-0.2.1.post1/README.md --- geomet-0.2.0.post2/README.md 1970-01-01 00:00:00.000000000 +0000 +++ geomet-0.2.1.post1/README.md 2020-01-27 11:00:26.000000000 +0000 @@ -0,0 +1,112 @@ +GeoMet [![Build Status](https://secure.travis-ci.org/geomet/geomet.png?branch=master)](http://travis-ci.org/geomet/geomet) +====== + +Convert [GeoJSON](http://www.geojson.org/geojson-spec.html) to +[WKT/WKB](http://en.wikipedia.org/wiki/Well-known_text) (Well-Known +Text/Binary), and vice versa. [Extended WKB/WKT](https://postgis.net/docs/using_postgis_dbmanagement.html#EWKB_EWKT) +are also supported. Conversion functions are exposed through +idiomatic `load/loads/dump/dumps` interfaces. + +The name "GeoMet" was inspired by "met", the German word for +[mead](http://en.wikipedia.org/wiki/Mead). It is also a shortened version of +the word "geometry". + +GeoMet is intended to cover all common use cases for dealing with 2D, 3D, and +4D geometries (including 'Z', 'M', and 'ZM'). + +The following conversion functions are supported. + +WKT/EWKT <--> GeoJSON: + +- Point +- LineString +- Polygon +- MultiPoint +- MultiLineString +- MultiPolygon +- GeometryCollection + +WKB/EWKB <--> GeoJSON: + +- Point +- LineString +- Polygon +- MultiPoint +- MultiLineString +- MultiPolygon +- GeometryCollection + +### Installation ### + +Install from [PyPI](https://pypi.python.org/pypi) (easiest method): + + $ pip install geomet + +Clone the source code from git and run: + + $ python setup.py install + +You can also install directly from the git repo using pip: + + $ pip install git+git://github.com/geomet/geomet.git + +### Example usage ### + +Coverting a 'Point' GeoJSON object to WKT: + + >>> from geomet import wkt + >>> point = {'type': 'Point', 'coordinates': [116.4, 45.2, 11.1]} + >>> wkt.dumps(point, decimals=4) + 'POINT (116.4000 45.2000 11.1000)' + +Converting a 'Point' GeoJSON object to WKB: + + >>> from geomet import wkb + >>> wkb.dumps(point) + '\x00\x00\x00\x10\x01@]\x19\x99\x99\x99\x99\x9a@F\x99\x99\x99\x99\x99\x9a@&333333' + >>> wkb.dumps(point, big_endian=False) + '\x01\x01\x10\x00\x00\x9a\x99\x99\x99\x99\x19]@\x9a\x99\x99\x99\x99\x99F@333333&@' + +Converting a 'LineString' GeoJSON object to WKT: + + >>> linestring = {'type':'LineString', + ... 'coordinates': [[0.0, 0.0, 10.0], [2.0, 1.0, 20.0], + ... [4.0, 2.0, 30.0], [5.0, 4.0, 40.0]]} + >>> wkt.dumps(linestring, decimals=0) + 'LINESTRING (0 0 10, 2 1 20, 4 2 30, 5 4 40)' + +Converting a 'LineString' GeoJSON object to WKB: + + >>> wkb.dumps(linestring) + '\x00\x00\x00\x10\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00@$\x00\x00\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00?\xf0\x00\x00\x00\x00\x00\x00@4\x00\x00\x00\x00\x00\x00@\x10\x00\x00\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00\x00@>\x00\x00\x00\x00\x00\x00@\x14\x00\x00\x00\x00\x00\x00@\x10\x00\x00\x00\x00\x00\x00@D\x00\x00\x00\x00\x00\x00' + >>> wkb.dumps(linestring, big_endian=False) + '\x01\x02\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00$@\x00\x00\x00\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00\xf0?\x00\x00\x00\x00\x00\x004@\x00\x00\x00\x00\x00\x00\x10@\x00\x00\x00\x00\x00\x00\x00@\x00\x00\x00\x00\x00\x00>@\x00\x00\x00\x00\x00\x00\x14@\x00\x00\x00\x00\x00\x00\x10@\x00\x00\x00\x00\x00\x00D@' + +Converting 'Point' WKT to GeoJSON: + + >>> wkt.loads('POINT(10 20)') + {'type': 'Point', 'coordinates': [10.0, 20.0]} + +Coverting 'GeometryCollection' WKT to GeoJSON: + + >>> wkt.loads('GEOMETRYCOLLECTION(POINT(10 20),POLYGON(((0 0), (10 30), (30 10), (0 0)))') + {'type': 'GeometryCollection', 'geometries': [{'type': 'Point', 'coordinates': [10.0, 20.0]}, {'type': 'Polygon', 'coordinates': [[[0.0, 0.0]], [[10.0, 30.0]], [[30.0, 10.0]], [[0.0, 0.0]]]}]} + +EWKT/EWKB are also supported for all geometry types. This uses a custom extension +to the GeoJSON standard in order to preserve SRID information through conversions. +For example: + + >>> wkt.loads('SRID=4326;POINT(10 20)') + {'type': 'Point', 'coordinates': [10.0, 20.0], 'meta': {'srid': '4326'}} + >>> wkt.dumps({'type': 'Point', 'coordinates': [10.0, 20.0], 'meta': {'srid': '4326'}, 'crs': {'properties': {'name': 'EPSG4326'}, 'type': 'name'}}) + 'SRID=4326;POINT (10.0000000000000000 20.0000000000000000)' + >>> wkb.loads('\x00 \x00\x00\x01\x00\x00\x10\xe6@$\x00\x00\x00\x00\x00\x00@4\x00\x00\x00\x00\x00\x00') + {'meta': {'srid': '4326'}, 'type': 'Point', 'coordinates': [10.0, 20.0]} + >>> wkb.dumps({'type': 'Point', 'coordinates': [10.0, 20.0], 'meta': {'srid': '4326'}, 'crs': {'properties': {'name': 'EPSG4326'}, 'type': 'name'}}) + '\x00 \x00\x00\x01\x00\x00\x10\xe6@$\x00\x00\x00\x00\x00\x00@4\x00\x00\x00\x00\x00\x00' + + +### See Also ### + +- [wellknown](https://github.com/mapbox/wellknown): A similar package for Node.js. +- [geo](https://github.com/bryanjos/geo): A nearly-identical package for Elixir. diff -Nru geomet-0.2.0.post2/setup.py geomet-0.2.1.post1/setup.py --- geomet-0.2.0.post2/setup.py 2018-09-05 08:16:25.000000000 +0000 +++ geomet-0.2.1.post1/setup.py 2020-01-27 11:00:26.000000000 +0000 @@ -10,6 +10,9 @@ from setuptools import find_packages from setuptools import setup +if (3,2) < sys.version_info < (3,4): + raise RuntimeError("Python3.3 is no longer supported") + def get_version(): version_re = r"^__version__\s+=\s+['\"]([^'\"]*)['\"]" @@ -48,11 +51,13 @@ 'Intended Audience :: Science/Research', 'Operating System :: OS Independent', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Topic :: Scientific/Engineering :: GIS', ], zip_safe=False, install_requires=['click', 'six'], + python_requires=">2.6, !=3.3.*, <4", )