[16.0][Feature] add website_geoengine_store_locator

base_geoengine/expressions.py

@@ -97,23 +97,23 @@ def get_geo_func(current_operator, operator, left, right, params, table):
     """
     This method will call the SQL query corresponding to the requested geo operator
     """
-    match operator:
-        case "geo_greater":
-            query = current_operator.get_geo_greater_sql(table, left, right, params)
-        case "geo_lesser":
-            query = current_operator.get_geo_lesser_sql(table, left, right, params)
-        case "geo_equal":
-            query = current_operator.get_geo_equal_sql(table, left, right, params)
-        case "geo_touch":
-            query = current_operator.get_geo_touch_sql(table, left, right, params)
-        case "geo_within":
-            query = current_operator.get_geo_within_sql(table, left, right, params)
-        case "geo_contains":
-            query = current_operator.get_geo_contains_sql(table, left, right, params)
-        case "geo_intersect":
-            query = current_operator.get_geo_intersect_sql(table, left, right, params)
-        case _:
-            raise NotImplementedError(f"The operator {operator} is not supported")
+
+    if operator == "geo_greater":
+        query = current_operator.get_geo_greater_sql(table, left, right, params)
+    elif operator == "geo_lesser":
+        query = current_operator.get_geo_lesser_sql(table, left, right, params)
+    elif operator == "geo_equal":
+        query = current_operator.get_geo_equal_sql(table, left, right, params)
+    elif operator == "geo_touch":
+        query = current_operator.get_geo_touch_sql(table, left, right, params)
+    elif operator == "geo_within":
+        query = current_operator.get_geo_within_sql(table, left, right, params)
+    elif operator == "geo_contains":
+        query = current_operator.get_geo_contains_sql(table, left, right, params)
+    elif operator == "geo_intersect":
+        query = current_operator.get_geo_intersect_sql(table, left, right, params)
+    else:
+        raise NotImplementedError(f"The operator {operator} is not supported")
     return query
 
 

base_geoengine/static/src/js/views/geoengine/geoengine_renderer/geoengine_renderer.esm.js

@@ -604,7 +604,7 @@ export class GeoengineRenderer extends Component {
             .getSource()
             .getExtent();
         var infinite_extent = [Infinity, Infinity, -Infinity, -Infinity];
-        if (extent !== infinite_extent) {
+        if (JSON.stringify(extent) !== JSON.stringify(infinite_extent)) {
             var map_view = this.map.getView();
             if (map_view) {
                 map_view.fit(extent, {maxZoom: 15});

base_geoengine/static/src/js/views/geoengine/records_panel/records_panel.esm.js

@@ -71,8 +71,10 @@ export class RecordsPanel extends Component {
      */
     filterItems(value, items) {
         const lowerValue = value.toLowerCase();
-        return items.filter(
-            (item) => item.data.display_name.toLowerCase().indexOf(lowerValue) >= 0
+        return items.filter((item) =>
+            item.data && item.data.display_name
+                ? item.data.display_name.toLowerCase().indexOf(lowerValue) >= 0
+                : false
         );
     }
 }

geoengine_partner/__manifest__.py

@@ -7,7 +7,7 @@
     "author": "Camptocamp, Odoo Community Association (OCA)",
     "license": "AGPL-3",
     "website": "https://github.com/OCA/geospatial",
-    "depends": ["base", "base_geoengine"],
+    "depends": ["base", "base_geoengine", "contacts"],
     "data": ["views/partner.xml"],
     "installable": True,
     "application": True,

geoengine_partner/views/partner.xml

@@ -71,4 +71,17 @@
         <field eval="0" name="overlay" />
     </record>
 
+    <record id="contacts.action_contacts" model="ir.actions.act_window">
+        <field name="view_mode">kanban,tree,form,activity,geoengine</field>
+    </record>
+
+
+
+    <record id="action_contacts_view_map" model="ir.actions.act_window.view">
+        <field name="sequence" eval="3" />
+        <field name="view_mode">geoengine</field>
+        <field name="view_id" ref="ir_ui_view_geo_partner" />
+        <field name="act_window_id" ref="contacts.action_contacts" />
+    </record>
+
 </odoo>

setup/website_geoengine/odoo/addons/website_geoengine

@@ -0,0 +1 @@
+../../../../website_geoengine

setup/website_geoengine/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

setup/website_geoengine_store_locator/odoo/addons/website_geoengine_store_locator

@@ -0,0 +1 @@
+../../../../website_geoengine_store_locator

setup/website_geoengine_store_locator/setup.py

@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)

website_geoengine/__init__.py

@@ -0,0 +1,2 @@
+from . import controllers
+from . import models

website_geoengine/__manifest__.py

@@ -0,0 +1,15 @@
+# Copyright 2011-2017 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+{
+    "name": "Geospatial Website",
+    "version": "16.0.1.0.0",
+    "description": "Create a method to search records getting only the ones that are 'is_published'",
+    "category": "GeoBI",
+    "author": "Camptocamp, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "website": "https://github.com/OCA/geospatial",
+    "depends": ["base_geoengine", "website", "partner_store"],
+    "data": [],
+    "installable": True,
+    "application": True,
+}

website_geoengine/controllers/__init__.py

@@ -0,0 +1 @@
+from . import res_partner

website_geoengine/controllers/res_partner.py

@@ -0,0 +1,19 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from odoo import http
+
+
+class ResPartner(http.Controller):
+    @http.route("/website-geoengine/tags", type="json", auth="public", cors="*")
+    def tags(self, **kw):
+        tags = kw.get("tags", {})
+        lang = kw.get("lang", "en_US")
+        return http.request.env["res.partner"].get_search_tags(tags, lang)
+
+    @http.route("/website-geoengine/partners", type="json", auth="public", cors="*")
+    def partners(self, **kw):
+        tags = kw.get("tags", {})
+        lang = kw.get("lang", "en_US")
+        maxResults = kw.get("maxResults", "200")
+        return http.request.env["res.partner"].fetch_partner_geoengine(
+            tags, lang, maxResults
+        )

website_geoengine/models/__init__.py

@@ -0,0 +1 @@
+from . import res_partner

website_geoengine/models/res_partner.py

@@ -0,0 +1,94 @@
+import logging
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+_logger = logging.getLogger(__name__)
+
+
+class ResPartner(models.Model):
+    _inherit = "res.partner"
+
+    opening_hours = fields.Char(string="Opening hours")
+
+    AUTHORIZED_FIELDS = ["name", "city", "zip", "street", "street2", "tag"]
+
+    @api.model
+    def get_search_tags(self, search, lang):
+        _logger.info(f"get_search_tags: {search}")
+        _logger.info(f"get_search_tags: {lang}")
+        # TODO FILTER res_partner on is_store = True AND is_published = True AND website_published = True. And filter category_ids on partners as well
+        sql = f"""
+        WITH
+            names as (SELECT DISTINCT 'name' as column, name as value FROM res_partner WHERE type='store'),
+            cities as (SELECT DISTINCT 'city' as column, city as value FROM res_partner WHERE type='store'),
+            zips as (SELECT DISTINCT 'zip' as column, zip as value FROM res_partner WHERE type='store'),
+            streets as (SELECT DISTINCT 'street' as column, concat(street, street2) as value FROM res_partner WHERE type='store'),
+            tags as (
+                SELECT DISTINCT
+                    'tag' as column,
+                    res_partner_category.name->>'{lang}' as value
+                FROM
+                    res_partner_category,
+                    res_partner_res_partner_category_rel,
+                    res_partner
+                WHERE
+                    res_partner_res_partner_category_rel.partner_id = res_partner.id
+                    AND
+                    res_partner_res_partner_category_rel.category_id = res_partner_category.id
+                    AND res_partner.type='store'
+            ),
+            all_tags as (SELECT * FROM names UNION SELECT * FROM cities UNION SELECT * FROM zips UNION SELECT * FROM streets UNION SELECT * FROM tags )
+
+
+        SELECT * FROM all_tags WHERE value ILIKE '%{search}%';
+        """
+        self._cr.execute(sql)
+        return self._cr.fetchall()
+
+    @api.model
+    def fetch_partner_geoengine(self, tags, lang, maxResults):
+        _logger.info(f"fetch_partner_geoengine: {tags}")
+        _logger.info(f"fetch_partner_geoengine: {lang}")
+
+        domain = [("type", "=", "store")]
+        for tag in tags:
+            field, value = tag.values()
+            _logger.info(f"fetch_partner_geoengine: {field}: {value}")
+            if field not in self.AUTHORIZED_FIELDS:
+                raise ValidationError(_("Unauthorized field"))
+            domain.append((field.replace("tag", "category_id.name"), "ilike", value))
+
+        partners = self.sudo().search(domain)
+        features = []
+
+        if len(partners) > int(maxResults):
+            return {
+                "error": "Too many results",
+                "message": f"Too many results: {len(partners)}",
+            }
+
+        for partner in partners:
+            features.append(
+                {
+                    "type": "Feature",
+                    "geometry": {
+                        "type": "Point",
+                        "coordinates": [
+                            partner.partner_longitude,
+                            partner.partner_latitude,
+                        ],
+                    },
+                    "properties": {
+                        "id": partner.id or None,
+                        "name": partner.name or "",
+                        "zip": partner.zip or "",
+                        "city": partner.city or "",
+                        "street": partner.street or "",
+                        "street2": partner.street2 or "",
+                        "tags": partner.category_id.mapped("name") or "",
+                        "opening_hours": partner.opening_hours or "",
+                    },
+                }
+            )
+        return features

website_geoengine_store_locator/README.rst

@@ -0,0 +1,75 @@
+=============================================
+Store map view widget (OpenStreetMap)
+=============================================
+
+
+This module extends the ``website_geoengine`` odoo module, to add
+a map snippet view for the website.
+By default the map features are filtered to only display contact of type `store`.
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Configuration
+=============
+
+You should configure first a web site. Then drag n drop the Store Locator widget from the OCA/Geopspatial section.
+
+.. figure:: ./static/description/snippet.png
+
+You can the configure the maximum number of results you want to display before to force your user to filter results.
+
+.. figure:: ./static/description/snippet_configuration.png
+
+Then go to 'Contact' app and add some store type address to your contacts and add them some tags.
+
+.. figure:: ./static/description/store_type.png
+
+Usage
+=====
+
+.. figure:: ./static/description/screencast.gif
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/geospatial/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/geospatial/issues/new?body=module:%20web_view_leaflet_map_partner%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Stéphane Brunner <[email protected]>  
+* Hadrien Huvelle <[email protected]>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+
+This module is part of the `OCA/geospatial <https://github.com/OCA/geospatial/tree/16.0/website_geoengine_store_locator>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

website_geoengine_store_locator/__manifest__.py

@@ -0,0 +1,34 @@
+# Copyright 2024 Camptocamp
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+{
+    "name": "Geospatial Website store locator",
+    "version": "16.0.1.0.0",
+    "description": "Adds a website widget to display a map with the store locations.",
+    "category": "GeoBI",
+    "author": "Camptocamp, Odoo Community Association (OCA)",
+    "license": "AGPL-3",
+    "website": "https://github.com/OCA/geospatial",
+    "depends": ["base_geoengine", "website", "partner_store", "website_geoengine"],
+    "data": [
+        "templates/snippets/s_openlayer_store_locator.xml",
+        "views/snippets.xml",
+    ],
+    "assets": {
+        "web.assets_frontend": [
+            "website_geoengine_store_locator/static/lib/node_modules/ol/dist/ol.js",
+            "website_geoengine_store_locator/static/lib/node_modules/jquery-flexdatalist/jquery.flexdatalist.js",
+            "website_geoengine_store_locator/static/src/scss/snippets/s_openlayer_store_locator/frontend.scss",
+            "website_geoengine_store_locator/static/src/js/snippets/s_openlayer_store_locator/frontend.js",
+            "website_geoengine_store_locator/static/src/js/snippets/s_openlayer_store_locator/popover.js",
+            "website_geoengine_store_locator/static/src/js/snippets/s_openlayer_store_locator/search.js",
+            "website_geoengine_store_locator/static/src/js/snippets/s_openlayer_store_locator/map.js",
+            "/web/static/lib/stacktracejs/stacktrace.js",
+        ],
+        "website.assets_wysiwyg": [
+            "website_geoengine_store_locator/static/src/js/snippets/s_openlayer_store_locator/snippet.options.js",
+        ],
+    },
+    "maintainers": ["Wouitmil"],
+    "installable": True,
+    "application": True,
+}