cone.maps 0.2__tar.gz → 1.1.0__tar.gz

cone_maps-1.1.0/.gitignore

@@ -0,0 +1,14 @@
+*.egg-info
+*.pyc
+/.coverage
+/.mxmake/
+/build/
+/constraints-mxdev.txt
+/dist/
+/node_modules/
+/package-lock.json
+/pnpm-lock.yaml
+/requirements-mxdev.txt
+/sources/
+/venv/
+__pycache__

cone_maps-1.1.0/CHANGES.rst

@@ -0,0 +1,45 @@
+Changes
+=======
+
+1.1.0 (2026-02-03)
+------------------
+
+- Refactor package layout to use ``pyproject.toml`` and implicit namespace packages.
+  [rnix]
+
+- Setup Makefile.
+  [lenadax]
+
+- Run tests with pytest.
+  [lenadax]
+
+- Add ``Path.Drag.js`` to resources.
+  [rnix]
+
+- Add ``Leaflet.Editable`` to resources.
+  [rnix]
+
+- Map settings are defined via ``MapTile.map_settings`` property.
+  [rnix]
+
+- Map settings gets rendered as single data attribute.
+  [rnix]
+
+- Add ``MapTile.map_bounds`` property.
+  [rnix]
+
+- Fix control layers creation in ``Map.create_controls``.
+  [rnix]
+
+- Implement map markers from JSON source.
+  [rnix]
+
+- Implement static map markers.
+  [rnix]
+
+
+0.1 (2021-11-21)
+----------------
+
+- Initial release.
+  [rnix]

{cone_maps-0.2 → cone_maps-1.1.0}/LICENSE.rst

@@ -1,7 +1,7 @@
 License
 =======
 
-Copyright (c) 2021, Cone Contributors
+Copyright (c) 2021-2025, Cone Contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{cone_maps-0.2 → cone_maps-1.1.0}/PKG-INFO

@@ -1,33 +1,27 @@
 Metadata-Version: 2.4
 Name: cone.maps
-Version: 0.2
+Version: 1.1.0
 Summary: Maps integration into cone using leaflet.js.
-Home-page: http://github.com/conestack/cone.maps
-Author: Cone Contributors
-Author-email: dev@conestack.org
+Project-URL: Homepage, http://github.com/conestack/cone.maps
+Author-email: Cone Contributors <dev@conestack.org>
 License: Simplified BSD
-Keywords: node pyramid cone web
+License-File: LICENSE.rst
+License-File: LICENSE_LEAFLET.rst
+Keywords: cone,node,pyramid,web
 Classifier: Environment :: Web Environment
 Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-License-File: LICENSE.rst
-License-File: LICENSE_LEAFLET.rst
-Requires-Dist: setuptools
-Requires-Dist: cone.app<1.1.0
-Requires-Dist: yafowil.widget.location<2.0.0
+Requires-Python: >=3.10
+Requires-Dist: cone-app>1.0.99
+Requires-Dist: yafowil-widget-location>1.99
 Provides-Extra: test
-Requires-Dist: zope.testrunner; extra == "test"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: license
-Dynamic: license-file
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: summary
+Requires-Dist: cone-app[test]; extra == 'test'
+Description-Content-Type: text/x-rst
 
 .. image:: https://img.shields.io/pypi/v/cone.maps.svg
     :target: https://pypi.python.org/pypi/cone.maps
@@ -37,12 +31,9 @@ Dynamic: summary
     :target: https://pypi.python.org/pypi/cone.maps
     :alt: Number of PyPI downloads
 
-.. image:: https://github.com/conestack/cone.maps/actions/workflows/python-package.yml/badge.svg
-    :target: https://github.com/conestack/cone.maps/actions/workflows/python-package.yml
-    :alt: Package build
-
-.. image:: https://coveralls.io/repos/github/bluedynamics/cone.maps/badge.svg?branch=master
-    :target: https://coveralls.io/github/bluedynamics/cone.maps?branch=master
+.. image:: https://github.com/conestack/cone.maps/actions/workflows/test.yml/badge.svg
+    :target: https://github.com/conestack/cone.maps/actions/workflows/test.yml
+    :alt: Test cone.maps
 
 
 This package provides maps integration in to cone.app.
@@ -61,6 +52,14 @@ This package provides maps integration in to cone.app.
   `Leaflet.markercluster <https://github.com/Leaflet/Leaflet.markercluster>`_
   (1.5.3) is included.
 
+* For making geometries editable in Leaflet,
+  `Leaflet.Editable <https://github.com/Leaflet/Leaflet.Editable>`_
+  (1.2.0) is included.
+
+* For adding dragging capability to Leaflet paths,
+  `Path.Drag.js <https://github.com/Leaflet/Path.Drag.js>`_
+  (0.0.6) is included.
+
 * For defining active map area, e.g. if parts of a map is used as background,
   `Leaflet-active-area <https://github.com/Mappy/Leaflet-active-area>`_
   (1.2.0) is included.
@@ -88,6 +87,9 @@ can be used as starting point for complex custom maps.
         """See ``cone.maps.browser.map`` for available tile options.
         """
 
+Not that ``cone.maps`` defines by default no height for maps. This must be
+done explicitely using CSS, or via custom JS map class.
+
 
 Resources
 ---------
@@ -107,6 +109,12 @@ available :
 - **cone.maps.markercluster**: Flag whether to include ``Leaflet.markercluster``
   plugin. Defaults to `false`.
 
+- **cone.maps.editable**: Flag whether to include ``Leaflet.Editable`` plugin.
+  Defaults to `false`.
+
+- **cone.maps.pathdrag**: Flag whether to include ``Path.Drag.js`` plugin.
+  Defaults to `false`.
+
 - **cone.maps.activearea**: Flag whether to include ``Leaflet-active-area``
   plugin. Defaults to `false`.
 
@@ -137,10 +145,40 @@ TODO
 Changes
 =======
 
-0.2 (2025-10-25)
-----------------
+1.1.0 (2026-02-03)
+------------------
+
+- Refactor package layout to use ``pyproject.toml`` and implicit namespace packages.
+  [rnix]
+
+- Setup Makefile.
+  [lenadax]
+
+- Run tests with pytest.
+  [lenadax]
+
+- Add ``Path.Drag.js`` to resources.
+  [rnix]
+
+- Add ``Leaflet.Editable`` to resources.
+  [rnix]
+
+- Map settings are defined via ``MapTile.map_settings`` property.
+  [rnix]
+
+- Map settings gets rendered as single data attribute.
+  [rnix]
+
+- Add ``MapTile.map_bounds`` property.
+  [rnix]
+
+- Fix control layers creation in ``Map.create_controls``.
+  [rnix]
+
+- Implement map markers from JSON source.
+  [rnix]
 
-- Pin upper versions of dependencies.
+- Implement static map markers.
   [rnix]
 
 
@@ -154,7 +192,7 @@ Changes
 License
 =======
 
-Copyright (c) 2021, Cone Contributors
+Copyright (c) 2021-2025, Cone Contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{cone_maps-0.2 → cone_maps-1.1.0}/README.rst

@@ -6,12 +6,9 @@
     :target: https://pypi.python.org/pypi/cone.maps
     :alt: Number of PyPI downloads
 
-.. image:: https://github.com/conestack/cone.maps/actions/workflows/python-package.yml/badge.svg
-    :target: https://github.com/conestack/cone.maps/actions/workflows/python-package.yml
-    :alt: Package build
-
-.. image:: https://coveralls.io/repos/github/bluedynamics/cone.maps/badge.svg?branch=master
-    :target: https://coveralls.io/github/bluedynamics/cone.maps?branch=master
+.. image:: https://github.com/conestack/cone.maps/actions/workflows/test.yml/badge.svg
+    :target: https://github.com/conestack/cone.maps/actions/workflows/test.yml
+    :alt: Test cone.maps
 
 
 This package provides maps integration in to cone.app.
@@ -30,6 +27,14 @@ This package provides maps integration in to cone.app.
   `Leaflet.markercluster <https://github.com/Leaflet/Leaflet.markercluster>`_
   (1.5.3) is included.
 
+* For making geometries editable in Leaflet,
+  `Leaflet.Editable <https://github.com/Leaflet/Leaflet.Editable>`_
+  (1.2.0) is included.
+
+* For adding dragging capability to Leaflet paths,
+  `Path.Drag.js <https://github.com/Leaflet/Path.Drag.js>`_
+  (0.0.6) is included.
+
 * For defining active map area, e.g. if parts of a map is used as background,
   `Leaflet-active-area <https://github.com/Mappy/Leaflet-active-area>`_
   (1.2.0) is included.
@@ -57,6 +62,9 @@ can be used as starting point for complex custom maps.
         """See ``cone.maps.browser.map`` for available tile options.
         """
 
+Not that ``cone.maps`` defines by default no height for maps. This must be
+done explicitely using CSS, or via custom JS map class.
+
 
 Resources
 ---------
@@ -76,6 +84,12 @@ available :
 - **cone.maps.markercluster**: Flag whether to include ``Leaflet.markercluster``
   plugin. Defaults to `false`.
 
+- **cone.maps.editable**: Flag whether to include ``Leaflet.Editable`` plugin.
+  Defaults to `false`.
+
+- **cone.maps.pathdrag**: Flag whether to include ``Path.Drag.js`` plugin.
+  Defaults to `false`.
+
 - **cone.maps.activearea**: Flag whether to include ``Leaflet-active-area``
   plugin. Defaults to `false`.
 

cone_maps-1.1.0/pyproject.toml

@@ -0,0 +1,67 @@
+[build-system]
+requires = ["hatchling", "hatch-fancy-pypi-readme"]
+build-backend = "hatchling.build"
+
+[project]
+name = "cone.maps"
+version = "1.1.0"
+description = "Maps integration into cone using leaflet.js."
+dynamic = ["readme"]
+requires-python = ">=3.10"
+license = {text = "Simplified BSD"}
+authors = [{name = "Cone Contributors", email = "dev@conestack.org"}]
+keywords = ["node", "pyramid", "cone", "web"]
+classifiers = [
+    "Environment :: Web Environment",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
+]
+dependencies = [
+    "cone.app>1.0.99",
+    "yafowil.widget.location>1.99",
+]
+
+[project.optional-dependencies]
+test = [
+    "cone.app[test]",
+]
+
+[project.urls]
+Homepage = "http://github.com/conestack/cone.maps"
+
+[tool.hatch.metadata.hooks.fancy-pypi-readme]
+content-type = "text/x-rst"
+fragments = [
+    {path = "README.rst"},
+    {text = "\n\n"},
+    {path = "CHANGES.rst"},
+    {text = "\n\n"},
+    {path = "LICENSE.rst"},
+]
+
+[tool.hatch.build.targets.sdist]
+exclude = [
+    "/.github/",
+    "/js/",
+    "/Makefile",
+    "/mx.ini",
+    "/package.json",
+    "/pnpm-lock.yaml",
+    "/scripts/",
+]
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/cone"]
+
+[tool.pytest.ini_options]
+consider_namespace_packages = true
+addopts = ["--import-mode=importlib"]
+pythonpath = "src"
+
+[tool.zest-releaser]
+create-wheel = true

cone_maps-1.1.0/src/cone/maps/__init__.py

@@ -0,0 +1,20 @@
+from cone.app import main_hook
+from cone.maps.browser import configure_resources
+import logging
+
+
+logger = logging.getLogger('cone.maps')
+
+
+@main_hook
+def initialize_maps(config, global_config, settings):
+    # application startup initialization
+
+    # static resources
+    configure_resources(config, settings)
+
+    # add translation
+    config.add_translation_dirs('cone.maps:locale/')
+
+    # scan browser package
+    config.scan('cone.maps.browser')

cone_maps-1.1.0/src/cone/maps/browser/__init__.py

@@ -0,0 +1,203 @@
+import webresource as wr
+import os
+
+
+resources_dir = os.path.join(os.path.dirname(__file__), 'static')
+
+
+# leaflet core
+leaflet_resources = wr.ResourceGroup(
+    name='cone.maps-leaflet',
+    directory=os.path.join(resources_dir, 'leaflet'),
+    path='leaflet'
+)
+leaflet_resources.add(wr.ScriptResource(
+    name='leaflet-js',
+    resource='leaflet-src.js',
+    compressed='leaflet.js'
+))
+leaflet_resources.add(wr.StyleResource(
+    name='leaflet-css',
+    resource='leaflet.css'
+))
+
+# Leaflet.TileLayer.NoGap
+leaflet_nogap_resources = wr.ResourceGroup(
+    name='cone.maps-leaflet-nogap',
+    directory=os.path.join(resources_dir, 'leaflet-nogap'),
+    path='leaflet-nogap'
+)
+leaflet_nogap_resources.add(wr.ScriptResource(
+    name='leaflet-nogap-js',
+    depends='leaflet-js',
+    resource='L.TileLayer.NoGap.js'
+))
+
+# leaflet-geosearch
+leaflet_geosearch_resources = wr.ResourceGroup(
+    name='cone.maps-leaflet-geosearch',
+    directory=os.path.join(resources_dir, 'leaflet-geosearch'),
+    path='leaflet-geosearch'
+)
+leaflet_geosearch_resources.add(wr.ScriptResource(
+    name='leaflet-geosearch-js',
+    depends='leaflet-js',
+    resource='geosearch.umd.js'
+))
+leaflet_geosearch_resources.add(wr.StyleResource(
+    name='leaflet-geosearch-css',
+    depends='leaflet-css',
+    resource='geosearch.css'
+))
+
+# Leaflet.markercluster
+leaflet_markercluster_resources = wr.ResourceGroup(
+    name='cone.maps-leaflet-markercluster',
+    directory=os.path.join(resources_dir, 'leaflet-markercluster'),
+    path='leaflet-markercluster'
+)
+leaflet_markercluster_resources.add(wr.ScriptResource(
+    name='leaflet-markercluster-js',
+    depends='leaflet-js',
+    resource='leaflet.markercluster-src.js',
+    compressed='leaflet.markercluster.js'
+))
+leaflet_markercluster_resources.add(wr.StyleResource(
+    name='leaflet-markercluster-css',
+    depends='leaflet-css',
+    resource='MarkerCluster.css'
+))
+leaflet_markercluster_resources.add(wr.StyleResource(
+    name='leaflet-markercluster-default-css',
+    depends='leaflet-markercluster-css',
+    resource='MarkerCluster.Default.css'
+))
+
+# Leaflet.Editable
+leaflet_editable_resources = wr.ResourceGroup(
+    name='cone.maps-leaflet-editable',
+    directory=os.path.join(resources_dir, 'leaflet-editable'),
+    path='leaflet-editable'
+)
+leaflet_editable_resources.add(wr.ScriptResource(
+    name='leaflet-editable-js',
+    depends='leaflet-js',
+    resource='Leaflet.Editable.js'
+))
+
+# Leaflet Path.Drag.js
+leaflet_pathdrag_resources = wr.ResourceGroup(
+    name='cone.maps-leaflet-pathdrag',
+    directory=os.path.join(resources_dir, 'leaflet-pathdrag'),
+    path='leaflet-pathdrag'
+)
+leaflet_pathdrag_resources.add(wr.ScriptResource(
+    name='leaflet-pathdrag-js',
+    depends='leaflet-js',
+    resource='Path.Drag.js'
+))
+
+# Leaflet-active-area
+leaflet_activearea_resources = wr.ResourceGroup(
+    name='cone.maps-leaflet-activearea',
+    directory=os.path.join(resources_dir, 'leaflet-activearea'),
+    path='leaflet-activearea'
+)
+leaflet_activearea_resources.add(wr.ScriptResource(
+    name='leaflet-activearea-js',
+    depends='leaflet-js',
+    resource='leaflet.activearea.js'
+))
+
+# proj4js
+proj4_resources = wr.ResourceGroup(
+    name='cone.maps-proj4',
+    directory=os.path.join(resources_dir, 'proj4js'),
+    path='proj4js'
+)
+proj4_resources.add(wr.ScriptResource(
+    name='proj4-js',
+    resource='proj4-src.js',
+    compressed='proj4.js'
+))
+
+# Proj4Leaflet
+leaflet_proj4_resources = wr.ResourceGroup(
+    name='cone.maps-leaflet-proj4',
+    directory=os.path.join(resources_dir, 'leaflet-proj4'),
+    path='leaflet-proj4'
+)
+leaflet_proj4_resources.add(wr.ScriptResource(
+    name='leaflet-proj4-js',
+    depends=['leaflet-js', 'proj4-js'],
+    resource='proj4leaflet.js'
+))
+
+# cone maps
+cone_maps_resources = wr.ResourceGroup(
+    name='cone.maps-maps',
+    directory=os.path.join(resources_dir, 'maps'),
+    path='maps'
+)
+cone_maps_resources.add(wr.ScriptResource(
+    name='cone-maps-js',
+    depends='leaflet-js',
+    resource='cone.maps.js',
+    compressed='cone.maps.min.js'
+))
+
+
+def configure_resources(config, settings):
+    def included(name):
+        return settings.get(name, 'false') == 'true'
+
+    include = True if included('cone.maps.public') else 'authenticated'
+
+    # Leaflet core
+    config.register_resource(leaflet_resources)
+    config.set_resource_include('leaflet-js', include)
+    config.set_resource_include('leaflet-css', include)
+
+    # Leaflet.TileLayer.NoGap
+    config.register_resource(leaflet_nogap_resources)
+    nogap_include = include if included('cone.maps.nogap') else False
+    config.set_resource_include('leaflet-nogap-js', nogap_include)
+
+    # leaflet-geosearch
+    config.register_resource(leaflet_geosearch_resources)
+    geosearch_include = include if included('cone.maps.geosearch') else False
+    config.set_resource_include('leaflet-geosearch-js', geosearch_include)
+    config.set_resource_include('leaflet-geosearch-css', geosearch_include)
+
+    # Leaflet.markercluster
+    config.register_resource(leaflet_markercluster_resources)
+    mc_include = include if included('cone.maps.markercluster') else False
+    config.set_resource_include('leaflet-markercluster-js', mc_include)
+    config.set_resource_include('leaflet-markercluster-css', mc_include)
+    config.set_resource_include('leaflet-markercluster-default-css', mc_include)
+
+    # Leaflet.Editable
+    config.register_resource(leaflet_editable_resources)
+    editable_include = include if included('cone.maps.editable') else False
+    config.set_resource_include('leaflet-editable-js', editable_include)
+
+    # Leaflet Path.Drag.js
+    config.register_resource(leaflet_pathdrag_resources)
+    pathdrag_include = include if included('cone.maps.pathdrag') else False
+    config.set_resource_include('leaflet-pathdrag-js', pathdrag_include)
+
+    # Leaflet-active-area
+    config.register_resource(leaflet_activearea_resources)
+    activearea_include = include if included('cone.maps.activearea') else False
+    config.set_resource_include('leaflet-activearea-js', activearea_include)
+
+    # proj4js and Proj4Leaflet
+    config.register_resource(proj4_resources)
+    config.register_resource(leaflet_proj4_resources)
+    proj4_include = include if included('cone.maps.proj4') else False
+    config.set_resource_include('proj4-js', proj4_include)
+    config.set_resource_include('leaflet-proj4-js', proj4_include)
+
+    # cone maps
+    config.register_resource(cone_maps_resources)
+    config.set_resource_include('cone-maps-js', include)