Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 6e789f6
Author: David <perssond9@gmail.com>
Date:   Tue May 2 08:25:14 2023 +0200

    feat: make prompt configurable for removable layers (origo-map#1759)

commit b3beca3
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Tue May 2 08:12:50 2023 +0200

    feature: post method for wms and wfs (origo-map#1756)

    * post method for wms and wfs

    * Update wfssource.js

    * Fixed wms

commit 2f01fb3
Merge: de6a4b9 1c93b79
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Thu Apr 27 14:51:23 2023 +0200

    Merge pull request origo-map#1753 from origo-map/named-target

    feature: make it possible for named target for attribute links

commit 1c93b79
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Wed Apr 26 15:41:57 2023 +0200

    feature: make it possible for named target for attribute links

commit d994d07
Merge: 1d1b62d de6a4b9
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Wed Apr 26 14:21:04 2023 +0200

    Merge branch 'master' of https://github.com/origo-map/origo into not-hidden

commit de6a4b9
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Apr 26 09:13:23 2023 +0200

    feature: make markers queryable and removeable (origo-map#1750)

commit 32d4647
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Tue Apr 25 15:50:07 2023 +0200

    feature: map marker (origo-map#1748)

    * feature: map marker

    * Update drawstyles.js

commit 2b6baaf
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Apr 24 10:48:33 2023 +0200

    fix: use mapstate-sharemap with draw control (origo-map#1745)

    * fix: use sharemap with draw control

    * Update viewer.js

commit 3002196
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Apr 12 15:00:54 2023 +0200

    Update print-resize.js (origo-map#1739)

commit 1d1b62d
Merge: 0c0db63 579d14e
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Wed Apr 12 13:50:36 2023 +0200

    Merge branch 'master' of https://github.com/origo-map/origo into not-hidden

commit 579d14e
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Apr 12 13:34:59 2023 +0200

    v2.7.0 (origo-map#1738)

commit 823feb3
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Wed Apr 12 13:34:21 2023 +0200

    Ignore attribut type for featureinfo (origo-map#1737)

commit 0c0db63
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Wed Apr 12 13:19:28 2023 +0200

    Ignore attribut type for featureinfo

commit 51298f7
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Apr 12 13:01:15 2023 +0200

    feature: draw as core control (origo-map#1714)

    * Added draw as control

    * Update stylewindow.js

    * Refactored code for measure control and added modify function

    * Update draw.js

    * Fixes for draw

    * Lots of stuff

    * Clean up permalink

    * Some styling fixes

    * Lint

    * Update viewer.js

    * Fix

    * stylewindow fix

    * Styling tweaks

    * Small fixes for print

    * Update stylewindow.js

    * Fix for labels and buffer measure

    * Forgot about measure in mapstate

    * Added projection for measures

    * drawHandler as component

    * Moved styling to layer level

    * Added screen/menu button placement

    * Initial state for save button

    * Added import layer functionality

    * Update viewer.js

    * Update drawtools.js

    * Unique layer names and new icon

    * Update draw.js

    * Fixed scaling when printing

    * Fix default function

    * Make group draggable

    * Fixed bugs

commit 9955160
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Thu Apr 6 08:54:41 2023 +0200

    Added layer parameter (origo-map#1736)

commit b8cf20a
Merge: 25f2e9d a4bf775
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Wed Apr 5 16:51:24 2023 +0200

    Merge pull request origo-map#1735 from origo-map/tab-legend-subgroups

    fix: only activate buttons on first level when expanding

commit a4bf775
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Wed Apr 5 11:42:52 2023 +0200

    fix: only ativate buttons on first level when expanding

commit 25f2e9d
Merge: e899204 0f37048
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Tue Apr 4 13:06:56 2023 +0200

    Merge pull request origo-map#1728 from origo-map/cql-filter-wms

    feature: filter on wms layer

commit e899204
Merge: 4ff81c9 5d3fe31
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Tue Apr 4 13:06:09 2023 +0200

    Merge pull request origo-map#1732 from origo-map/editor-fix

    fix: editor toolbar visible as default

commit 4ff81c9
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Tue Apr 4 11:52:02 2023 +0200

    Update _validate.scss (origo-map#1733)

commit 5d3fe31
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Apr 4 10:55:57 2023 +0200

    fix: editor toolbar visible as default

commit 5dfe2e9
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Apr 3 16:06:18 2023 +0200

    fix: update zoom level when scroll zooming (origo-map#1730)

    * fix: update zoom level when scroll zooming

    * Update maputils.js

commit f042087
Author: Stefan Forsgren <33832077+steff-o@users.noreply.github.com>
Date:   Mon Apr 3 12:06:28 2023 +0200

    feature: Add group aggregations and length attribute helper. (origo-map#1708)

    * Added group aggregations and length attribute helper.

    * Uses ol/sphere for measurements

    * Automatic units for area en length and aligning result i infowindow

    * Lint...

    ---------

    Co-authored-by: Stefan Forsgren <stefan@forsgren@xlent.se>

commit 0a35356
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Fri Mar 31 12:19:27 2023 +0200

    feature: defaultLayerParams in config (origo-map#1727)

    * Added defaultLayerParams

    * Update viewer.js

commit 0f37048
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Thu Mar 30 14:15:33 2023 +0200

    Changed to generic setting of params for source

commit 36903d0
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Mar 28 11:56:19 2023 +0200

    Added support for QGIS Server filter

commit 166fd01
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Fri Mar 24 15:04:53 2023 +0100

    feature: filter on wms layer

commit 33233b0
Author: David <perssond9@gmail.com>
Date:   Fri Mar 24 11:47:08 2023 +0100

    fix: avoid redundant scale param for WMS getlegendgraphic (origo-map#1724)

commit 05b3fd6
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Fri Mar 24 11:22:43 2023 +0100

    Minor bug fix (origo-map#1722)

commit ab36426
Author: David <perssond9@gmail.com>
Date:   Fri Mar 24 10:48:58 2023 +0100

    fix: decouple default WMS server style and preselected style for the … (origo-map#1715)

    * fix: decouple default WMS server style and preselected style for the stylepicker in order to accomodate preselected alternative WMS server styles when a stylepicker is employed for WMS layers

    * fix: tolerate missing initialStyle prop in layerPicker

commit 0669dd5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Mar 22 13:45:14 2023 +0100

    build(deps-dev): bump webpack from 5.67.0 to 5.76.0 (origo-map#1712)

    Bumps [webpack](https://github.com/webpack/webpack) from 5.67.0 to 5.76.0.
    - [Release notes](https://github.com/webpack/webpack/releases)
    - [Commits](webpack/webpack@v5.67.0...v5.76.0)

    ---
    updated-dependencies:
    - dependency-name: webpack
      dependency-type: direct:development
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 08e6ba4
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Mar 22 13:41:11 2023 +0100

    Add mapState as parameter (origo-map#1717)

commit b8053b3
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Tue Mar 7 07:28:35 2023 +0100

    feature: featureinfo templates with alias and API functionality (origo-map#1682)

    * feature: aliases with featureinfo templates

    Fixes origo-map#1681
    Configured like:
      "attributeAlias": {
        "name":"Namn"
      }
    in the config. Can be tested by removing the attribute setting for the origo cities layer in the standard map.

    * Added API functionality

    * Update map.js

    mapConfig assigned with switch statement

commit 4252658
Merge: e9164ff 288fd34
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Mon Mar 6 16:24:26 2023 +0100

    Merge pull request origo-map#1707 from origo-map/fix-invalid-json

    fix: fix invalid backslash in json

commit e9164ff
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Mar 6 15:10:12 2023 +0100

    fix: minor bugs and api additions (origo-map#1684)

    * Functionality to add layers with layerimport-plugin

    * More additions to the API

    * Minor stuff

    * lint

    * Update permalink.js

    * Lint

commit 7506505
Author: David <perssond9@gmail.com>
Date:   Mon Mar 6 14:26:29 2023 +0100

    feature: change the type of layertype.js to be layerType instead of type for VSCode syntax highlight compatibility (origo-map#1706)

commit 288fd34
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Mon Mar 6 13:18:28 2023 +0100

    fix: try to fix invalid backslash in json

commit c554124
Merge: 1811b5f 7d0edc3
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Mon Mar 6 10:52:19 2023 +0100

    Merge branch 'master' of https://github.com/origo-map/origo into break-word

commit 7d0edc3
Merge: 602be73 5cf0c91
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Mon Mar 6 10:15:51 2023 +0100

    Merge pull request origo-map#1704 from origo-map/break-word

    Break word

commit 1811b5f
Merge: 5cf0c91 602be73
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Mon Mar 6 09:55:50 2023 +0100

    Merge branch 'master' of https://github.com/origo-map/origo into break-word

commit 5cf0c91
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Mon Mar 6 09:53:18 2023 +0100

    fix: break word for case of long layer title

commit 602be73
Merge: 50f2fa1 4f40a4c
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Mon Mar 6 09:42:20 2023 +0100

    Merge pull request origo-map#1700 from origo-map/timestamp-format

    feature: support timestamp when formatDatetime

commit 50f2fa1
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Mar 6 08:47:55 2023 +0100

    OL v7.3.0 (origo-map#1703)

commit 27a9827
Merge: 4f40a4c 1451535
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Mon Mar 6 08:21:22 2023 +0100

    Merge branch 'master' of https://github.com/origo-map/origo into timestamp-format

commit 1451535
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Mar 6 08:13:15 2023 +0100

    feature: add draggable option for groups (origo-map#1694)

    * Adds draggable option for groups

    * Added polyfill for touch devices

    * Minor fix

commit 4f40a4c
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Fri Mar 3 15:52:09 2023 +0100

    feature: support timestamp when formatDatetime

commit 2cf9053
Author: tonnyandersson <tonnyandersson@users.noreply.github.com>
Date:   Thu Mar 2 16:32:05 2023 +0100

    fix: added crossOrigin option (origo-map#1696)

    * Added crossOrigin option

    * Get actual crossOrigin from source

commit 5331fd3
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Mar 1 16:08:35 2023 +0100

    Fix for hidden styles in print legend (origo-map#1695)

commit a47af1d
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Feb 22 15:45:36 2023 +0100

    feature: add feature styling (origo-map#1677)

    * feat: add feature styling

    Fixes origo-map#1676
    Adds the possibility to set the drag and drop control as well as a geojson source to style features based on the "style" attribute of the feature rather than the layer style.
    Configured as `"styleByAttribute":true` as options for the drag and drop control or property of a geojson-layer.
    False by default

    * Update draganddrop.js

commit e6aa4be
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Feb 22 15:37:20 2023 +0100

    feature: confirm removal of layer (origo-map#1675)

    * feat: confirm removal of layer

    Fixes origo-map#1674
    Setting "confirmRemoval": true pops up a confirm dialog window
    This commit also includes also removes redundant calls to removeOverlay-method and relies on the event instead.

    * Update overlay.js

commit e3e5290
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Feb 22 15:21:07 2023 +0100

    feature: import layer button (origo-map#1685)

    * feature: import layer button

    Fixes origo-map#1678
    Adds a button in the legend for import of layer as file. Defaults to false.
        {
          "name": "draganddrop",
          "options": {
            "showLegendButton": true
          }
        },

    * Fix for readding layers

    * Changed icon

    * Added popup menu for add layer

    * Update legend.js

    * Some css

    * Added some styling

commit a7ce1ce
Merge: 663156b 88ce023
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Wed Feb 22 13:26:26 2023 +0100

    Merge pull request origo-map#1691 from origo-map/pr-subject

    docs: updating guidelines for PR subject

commit 88ce023
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Mon Feb 20 16:41:04 2023 +0100

    docs: updating guidelines for PR subject

commit 663156b
Author: David <perssond9@gmail.com>
Date:   Fri Feb 17 08:49:40 2023 +0100

    feature: make the central print component available externally (origo-map#1673)

commit d05a48c
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Feb 15 14:45:58 2023 +0100

    feature: center marker for externalurl (origo-map#1686)

    Fixes origo-map#1672
    Adds a centerMarker component to the viewer, easy to use with show/hide methods.
    Future improvements are to use this along with eg the position control, but they somehow has to respect each other.

commit e57a86d
Merge: 96c34bf 8de45ed
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Mon Feb 13 08:31:52 2023 +0100

    Merge pull request origo-map#1689 from origo-map/fix-drawtool

    fix: drawtool other than default

commit 8de45ed
Merge: 32ba211 96c34bf
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Fri Feb 10 14:02:31 2023 +0100

    Merge branch 'master' of https://github.com/origo-map/origo into drawtool-fix

commit 96c34bf
Merge: a7c3f5b ab12463
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Fri Feb 10 13:50:06 2023 +0100

    Merge pull request origo-map#1664 from origo-map/legend-search-list

    fix: search result not hidden in legend search

commit 32ba211
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Fri Feb 10 13:48:32 2023 +0100

    fix: set drawtype if other than default

commit a7c3f5b
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Thu Feb 9 11:20:27 2023 +0100

    feature: wfs filtering (origo-map#1680)

    Fixes origo-map#1679
    Adds setFilter and clearFilter methods to the wfs source
    Example:
    origo.api().getLayer('my_layer').getSource().setFilter("namn in ('Museiparken')")

commit ab12463
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Feb 7 15:57:21 2023 +0100

    break words

commit e93b0d3
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Feb 7 14:38:16 2023 +0100

    max width on search result

commit 8d0f029
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Feb 7 11:22:59 2023 +0100

    Lint fix

commit b466a5a
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Feb 7 10:46:56 2023 +0100

    Fixed width on search list

commit 469a3f6
Author: David <perssond9@gmail.com>
Date:   Mon Feb 6 10:08:27 2023 +0100

    feature: Wms stylepicker legendparams (origo-map#1670)

    * feat: add legendparams to stylepicker wms styles

    * fix: key instead of k

commit 285a4ee
Author: David <perssond9@gmail.com>
Date:   Mon Feb 6 08:42:52 2023 +0100

    fix: really disable print buttons while print preview map is loading (origo-map#1663)

    * fix: really disable print buttons while print preview map is loading

    * fix: revise button event disabling after suggestion

    ---------

    Co-authored-by: Jonas <jonas.kumlin@karlstad.se>

commit 5a2e090
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Fri Feb 3 14:48:44 2023 +0100

    fix: crash when printing on iOS (origo-map#1666)

    * fix: crash on iOS

    Lowered the pixelratio when printing

    * Update print-component.js

commit d60c75c
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Fri Feb 3 09:48:54 2023 +0100

    fix: lint issues (origo-map#1669)

    * fix: lint issues

    * More

commit 322a0d9
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Feb 3 09:35:54 2023 +0100

    Bump http-cache-semantics from 4.1.0 to 4.1.1 (origo-map#1667)

    Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1.
    - [Release notes](https://github.com/kornelski/http-cache-semantics/releases)
    - [Commits](kornelski/http-cache-semantics@v4.1.0...v4.1.1)

    ---
    updated-dependencies:
    - dependency-name: http-cache-semantics
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit dc110a0
Author: Jan Dalheimer <jan.dalheimer@sweco.se>
Date:   Fri Feb 3 09:29:04 2023 +0100

    Fix lint issues and add linting to CI (origo-map#1561)

commit 3c1b4b8
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Thu Feb 2 17:01:26 2023 +0100

    added wrapper element

commit f4ee7ef
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Wed Feb 1 16:40:08 2023 +0100

    fix: search result not hidden in legend search

commit a61d3e3
Merge: 8e3ce89 4283fa8
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Mon Jan 30 13:13:46 2023 +0100

    Merge pull request origo-map#1571 from origo-map/layers-on

    feature: turn on all layers button

commit 8e3ce89
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Jan 30 10:54:47 2023 +0100

    fix: getfeatureinfo on grouplayers (origo-map#1659)

    * Fix issue origo-map#1614

    getfeatureinfo on grouplayers

    * Update getfeatureinfo.js

    * Update getfeatureinfo.js

    * Skip check if layer group is queryable

commit 2a1d9bf
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Jan 30 10:54:32 2023 +0100

    fix: print fix ios (origo-map#1658)

    * Fix print on iOS

    * Removed unused function

    * Update print-component.js

    * Lint

    * minor fix

    * png download

commit 4283fa8
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Fri Jan 27 14:48:09 2023 +0100

    Use full width of legend for legend items

commit 4a70656
Merge: 9987fca da63e1e
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Fri Jan 27 10:28:13 2023 +0100

    Merge branch 'master' of https://github.com/origo-map/origo into layers-on

commit da63e1e
Author: Stefan Forsgren <33832077+steff-o@users.noreply.github.com>
Date:   Wed Jan 25 15:36:37 2023 +0100

    feature: support for value and label in searchList (origo-map#1624)

    * Added support for value and label in searchList

    * Small fixes

    Support for value being other than string
    Fixed a bug when minChar was missing

    Co-authored-by: Stefan Forsgren <stefan@forsgren@xlent.se>

commit 6406e48
Author: David <perssond9@gmail.com>
Date:   Wed Jan 25 13:04:41 2023 +0100

    featuer: add imagefeatureinfomode featureinfo option to control featurei… (origo-map#1652)

    * feat: add imagefeatureinfomode featureinfo option to control featureinfo requests for image type layers

    * fix: rework logic to accomodate latest solution suggestion

    * fix: make somewhat viable

commit 3b2eb6b
Author: Jan Dalheimer <jan.dalheimer@sweco.se>
Date:   Wed Jan 25 12:44:37 2023 +0100

    feature: Separate printRenderMode for better labeling in printed maps (origo-map#1542)

    * Separate printRenderMode for better labeling in printed maps

    * fix: remove unrelated changes

    * fix: undo changed functions and fix event names

commit de584ee
Author: David <perssond9@gmail.com>
Date:   Wed Jan 25 12:43:26 2023 +0100

    fix: make layers with workspace:layer names work with stylePicker (origo-map#1655)

commit be2d9d7
Merge: 46d8944 22ea605
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Wed Jan 25 09:03:40 2023 +0100

    Merge pull request origo-map#1656 from origo-map/new-origo-cities-and-mask

    fix: new Origo mask and cities

commit 22ea605
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Jan 24 11:49:17 2023 +0100

    fix: new Origo mask and cities

commit 46d8944
Merge: f4ed24e b959824
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Wed Jan 18 10:53:02 2023 +0100

    Merge pull request origo-map#1635 from origo-map/hide-controls

    feature: hide controls instead of not adding them on "hideWhenEmbedded"

commit b959824
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Fri Jan 13 14:41:25 2023 +0100

    Switch from toggle to separate hide/unhide method

commit 33e7fa0
Merge: e6f9d74 f4ed24e
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Fri Jan 13 10:03:21 2023 +0100

    Merge branch 'master' of https://github.com/origo-map/origo into hide-controls

    # Conflicts:
    #	src/controls/editor.js

commit f4ed24e
Merge: 0ce8693 01d4746
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Thu Jan 12 17:07:23 2023 +0100

    Merge pull request origo-map#1626 from origo-map/bugfix-print-resize

    fix: reset features style after print control

commit 01d4746
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Thu Jan 12 16:07:41 2023 +0100

    Fix for saving original values

commit 0ce8693
Author: Stefan Forsgren <33832077+steff-o@users.noreply.github.com>
Date:   Thu Jan 12 12:22:02 2023 +0100

    feature: editor api (origo-map#1625)

    * Added api to editor

    * Cleaned up comments

    * Change drawtools on layer change

    Co-authored-by: Stefan Forsgren <stefan@forsgren@xlent.se>

commit 42404fd
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Thu Jan 12 09:26:28 2023 +0100

    New version of OpenLayers (origo-map#1648)

    New version of OpenLayers and removed monkey patch in print component since OL now have native support for transform: scale

commit 9708b9d
Merge: 5a8e978 2195f9f
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Mon Jan 9 14:27:59 2023 +0100

    Merge pull request origo-map#1650 from origo-map/johnnyblasta-patch-1

    Update codeql-analysis.yml

commit 2195f9f
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Mon Jan 9 14:12:35 2023 +0100

    Update to nodejs 16 action

commit c01b51d
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Mon Jan 9 13:47:29 2023 +0100

    Unnescarry step

commit bdda61e
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Mon Jan 9 11:56:08 2023 +0100

    Update codeql-analysis.yml

    New version needed, since will be deprecated soon (18/1).

commit 5a8e978
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Jan 9 08:25:21 2023 +0100

    dep: node-sass v7.0.3 (origo-map#1649)

commit 69bfdd8
Merge: 2dfb316 60ea965
Author: filleg <50096970+filleg@users.noreply.github.com>
Date:   Wed Jan 4 15:37:43 2023 +0100

    Merge pull request origo-map#1637 from origo-map/plugins_doc

    docs: Plugins doc

commit 60ea965
Author: filleg <50096970+filleg@users.noreply.github.com>
Date:   Wed Jan 4 13:35:38 2023 +0100

    Update PLUGINS.md

commit 2dfb316
Author: David <perssond9@gmail.com>
Date:   Wed Jan 4 10:56:05 2023 +0100

    fix: add method for plugins to regenerate visible layers (origo-map#1597)

    * fix: add method for plugins to regenerate visible layers

    * fix: add choice so that not just activate

commit 98f9643
Author: filleg <50096970+filleg@users.noreply.github.com>
Date:   Tue Dec 27 08:50:05 2022 +0100

    update plugins.md

    spelling

commit b5ab51c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed Dec 21 11:57:49 2022 +0100

    Bump express from 4.17.2 to 4.18.2 (origo-map#1639)

    Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2.
    - [Release notes](https://github.com/expressjs/express/releases)
    - [Changelog](https://github.com/expressjs/express/blob/master/History.md)
    - [Commits](expressjs/express@4.17.2...4.18.2)

    ---
    updated-dependencies:
    - dependency-name: express
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

    Signed-off-by: dependabot[bot] <support@github.com>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit f1eba60
Author: filleg <50096970+filleg@users.noreply.github.com>
Date:   Fri Dec 9 10:49:20 2022 +0100

    Update PLUGINS.md

commit 40c2835
Author: Mathias Thorén <mathias.thoren@sweco.se>
Date:   Wed Dec 7 15:59:26 2022 +0100

    feature: enable WMS-layers in stylepicker (origo-map#1633)

    * feat: add wms-layers to style picker

    * feat: add wms-layers to style picker

    * feat: add wms stylepicker support for sharemap

    * feat: sharemap support for wms image layers

    * feat: get local wms source if exists for print legend

    * feat: add wms-layers to style picker

    * feat: add wms stylepicker support for sharemap

    * feat: sharemap support for wms image layers

    * feat: get local wms source if exists for print legend

commit e6f9d74
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Wed Dec 7 15:02:43 2022 +0100

    Don't add controls which is missing hide function.

commit aa4d133
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Dec 6 16:34:02 2022 +0100

    Taking into account menuitem controls and draganddrop control

commit 11abf12
Author: Johnny Blästa <johnny.blasta@sundsvall.se>
Date:   Tue Dec 6 14:41:18 2022 +0100

    feature: hide controls instead of not adding them on "hideWhenEmbedded"

commit c26b6bb
Merge: c2194ab 3f6c202
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Thu Nov 10 12:53:26 2022 +0100

    Merge pull request origo-map#1630 from ornskoldsvikskommun/master

    fix: only header draggable in infowindow expandable list.

commit 3f6c202
Author: Stefan Forsgren <stefan@forsgren@xlent.se>
Date:   Wed Nov 9 11:59:35 2022 +0100

    Made only header draggable in infowindow expandable list.

commit 77aad69
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Wed Nov 2 16:37:31 2022 +0100

    Check for empty style

commit c2194ab
Merge: c12cdcd 2504e2e
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Wed Nov 2 09:12:44 2022 +0100

    Merge pull request origo-map#1623 from ornskoldsvikskommun/wgs84-dms

    feature: support for DMS in position control

commit 2504e2e
Author: Stefan Forsgren <stefan@forsgren@xlent.se>
Date:   Tue Nov 1 07:50:32 2022 +0100

    Fixed comments

commit c12cdcd
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Oct 31 14:53:27 2022 +0100

    Fix for exclusive layers in legend search (origo-map#1621)

commit 95e4d8d
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Mon Oct 31 14:53:04 2022 +0100

    Fix for splash control with multiple maps (origo-map#1622)

commit 59c2a00
Author: Stefan Forsgren <stefan@forsgren@xlent.se>
Date:   Mon Oct 31 13:26:41 2022 +0100

    Fixed seconds calculation

commit 64a47d5
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Fri Oct 28 15:51:04 2022 +0200

    fix: reset features style after print control

commit 6207af2
Author: Stefan Forsgren <stefan@forsgren@xlent.se>
Date:   Thu Oct 27 14:57:16 2022 +0200

    Added support for DMS in position control

commit 9987fca
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Wed Oct 26 11:16:10 2022 +0200

    Clearifying purpose with button

commit 7570e6c
Merge: 8d000f2 71afbab
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Wed Oct 26 11:08:31 2022 +0200

    Merge branch 'master' of https://github.com/origo-map/origo into layers-on

commit ac41ad1
Author: filleg <50096970+filleg@users.noreply.github.com>
Date:   Fri Oct 14 14:59:09 2022 +0200

    upd plugins.md

commit 8d000f2
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Wed Oct 12 13:35:55 2022 +0200

    Skip if group is exclusive

commit 71afbab
Merge: 9989cb1 75f21a8
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Wed Oct 12 09:18:52 2022 +0200

    Merge pull request origo-map#1607 from origo-map/print-lmsearch

    fix: print with overlays from LMSearch plugin

commit f394b87
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Wed Oct 12 09:11:44 2022 +0200

    Search outside of layerControlCmps

commit 9989cb1
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Wed Oct 12 08:40:49 2022 +0200

    Update _awesomplete.theme.scss (origo-map#1600)

commit e3a5102
Merge: 62529cd 7483f67
Author: Johnny Blästa <48793206+johnnyblasta@users.noreply.github.com>
Date:   Wed Oct 12 08:16:57 2022 +0200

    Merge pull request origo-map#1604 from SigtunaGIS/origo-master-add-plugins

    docs: add swiper and oidc to plugins.md

commit 75f21a8
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Fri Sep 30 14:42:11 2022 +0200

    fix: print with overlays from LMSearch plugin

commit 7483f67
Author: asemoller <ase.moller@sigtuna.se>
Date:   Fri Sep 30 09:09:40 2022 +0200

    Add swiper and oidc to plugins.md

commit 62529cd
Author: Jonas <jonas.kumlin@karlstad.se>
Date:   Tue Sep 20 10:17:11 2022 +0200

    Scalebar styling (origo-map#1595)

commit 949c5f3
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Tue Jul 19 13:54:30 2022 +0200

    Changed adding buttons

commit 9f9ce6d
Author: Blästa Johnny <johnny.blasta@sundsvall.se>
Date:   Mon Jul 18 13:44:11 2022 +0200

    Turn on all layers button
  • Loading branch information
@Flodkvist
Flodkvist committed May 26, 2023
1 parent e3aeade commit b7284a5
Show file tree
Hide file tree
Showing 129 changed files with 114,651 additions and 93,584 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/codeql-analysis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,31 +30,26 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head.
fetch-depth: 2

# If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }}

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -68,4 +63,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
17 changes: 17 additions & 0 deletions .github/workflows/lint.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Lint
on:
push:
pull_request:
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 14
cache: 'npm'
- name: Install dependencies
run: npm install
- name: Run ESLint
run: npm run lint
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ Your pull request should:

* Be able to merge without conflicts.

* The subject of the PR has to start with one of these prefix:
* dep: updated dependencies
* docs: editing .md-files in this repo
* feature: for new features
* fix: bugfix or rewritten code that doesn't add new functionality

### Commit messages guidelines

We are using the same guidelines for commit messages as the [OpenLayers project](https://github.com/openlayers/openlayers).
Expand Down
16 changes: 14 additions & 2 deletions PLUGINS.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@

# Origo plugins
More information about how to develop and utilize plugins with Origo will be added soon.
Plugins are to be developed when a feature or function is not appropriate to be included in the origo core. Common reasons are external dependencies or a specific feature or function not requested by the average user.
## Guidelines development

**[Barebone](https://github.com/origo-map/barebone-plugin)** is an example plugin to provide an initial structure of how you can start developing your plugin.

Origo core has a lot of dependencies by default which are available to use from the plugins. They should be utilized first before loading more external libraries.

Smaller adjustment to the core might be necessary but should be avoided to make the plugin as standalone as possible.

## Available plugins
Below is a list of available plugins. More information about each plugin can be found in the plugin's own repository.
Expand All @@ -27,3 +33,9 @@ Search for Lantmäteriet Direct services via Origoserver API.

**[Multiselect plugin](https://github.com/origo-map/multiselect-plugin)**
Plugin to select features with different methods such as circle, polygon and buffer.

**[OIDC plugin](https://github.com/SigtunaGIS/oidc-plugin)**
A plugin for openid connect authorization with Origo.

**[Swiper plugin](https://github.com/SigtunaGIS/swiper-plugin)**
A plugin to compare two different views.
85 changes: 74 additions & 11 deletions build/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@
flex-basis: 75%; }
.o-ui .flex .basis-100 {
flex-basis: 100%; }
.o-ui .flex .small-gap {
gap: 0.2rem; }
.o-ui .grid {
display: flex;
flex-wrap: wrap;
Expand Down Expand Up @@ -629,6 +631,9 @@
transform: rotate(180deg); }
.o-ui .collapse-scroll.expanded {
height: calc(100% - 2rem); }
.o-ui .move-item {
background-color: #008ff5;
opacity: 0.2; }
.o-ui .icon-smallest:not(.button):not(button) {
height: 0.75rem;
width: 0.75rem; }
Expand Down Expand Up @@ -1290,6 +1295,8 @@
line-height: 1rem; }
.o-ui .text-height-smallest.text-fade::after {
height: 1rem; }
.o-ui .break-word {
word-wrap: break-word; }
.o-ui .z-index-bottom {
z-index: 0; }
.o-ui .z-index-low {
Expand Down Expand Up @@ -1451,6 +1458,12 @@
right: 30px;
margin-top: -30px;
width: max-content; }
.o-ui .popup-menu.button-popup {
position: absolute;
text-align: left;
width: max-content;
bottom: 5px;
left: 0; }

.app {
background-color: rgba(0, 0, 0, 0.1);
Expand Down Expand Up @@ -1618,6 +1631,12 @@ body {
margin: 1px;
padding: 0 2px;
text-align: center; }
.o-map .ol-scale-bar-inner {
display: flex; }
.o-map .ol-scale-singlebar-even {
background-color: #000000; }
.o-map .ol-scale-singlebar-odd {
background-color: #FFFFFF; }
.o-map .ol-has-tooltip [role=tooltip] {
border: 0;
clip: rect(1px 1px 1px 1px);
Expand Down Expand Up @@ -2515,6 +2534,47 @@ body {
width: 100%; }
.o-map[class*=o-media-l-m-s-xs] #o-sidebar {
display: none; }
.o-map .o-draw-toolbar {
bottom: 0;
left: 50%;
margin-bottom: .5rem !important;
max-width: 80%;
position: relative;
-ms-transform: translate(-50%, 0);
-webkit-transform: translate(-50%, 0);
transform: translate(-50%, 0);
z-index: 10; }
.o-map .o-draw-stylewindow {
font-family: Arial,sans-serif;
width: 250px;
position: absolute;
right: 1rem;
-ms-transform: translate(0, -50%);
-webkit-transform: translate(0, -50%);
transform: translate(0, -50%);
top: 50%;
height: calc(100% - 9rem); }
.o-map .o-draw-stylewindow input[type="radio"] {
display: none; }
.o-map .o-draw-stylewindow input[type="radio"] + label span {
display: inline-block;
width: 24px;
height: 24px;
vertical-align: middle;
cursor: pointer;
-moz-border-radius: 50%;
border-radius: 50%;
box-shadow: 0 0 0 2px white, 0 0 0 4px white; }
.o-map .o-draw-stylewindow input[type="radio"]:checked + label span {
box-shadow: 0 0 0 2px white, 0 0 0 4px #ababab; }
.o-map .o-draw-stylewindow input[type="radio"] ~ label span:hover {
box-shadow: 0 0 0 2px white, 0 0 0 4px #cdcdcd; }
.o-map .o-draw-stylewindow input[type="radio"] ~ label {
display: inline-block;
vertical-align: middle;
padding: 5px; }
.o-map .o-draw-stylewindow ul li {
float: left; }
.o-map #o-editor-button .o-icon-fa-pencil {
height: 1em;
padding: 0.25em;
Expand Down Expand Up @@ -2617,7 +2677,7 @@ body {
margin: 0; }
.o-map input.o-position-find {
padding: 0;
width: 95px; }
width: auto; }
.o-map .o-progress {
background: #008ff5;
bottom: 0;
Expand Down Expand Up @@ -2758,7 +2818,9 @@ body {
left: 0px;
list-style: none;
margin: 0;
min-width: 100%;
min-width: 180px;
max-width: 100%;
overflow-wrap: break-word;
padding: 0;
position: absolute;
top: auto;
Expand Down Expand Up @@ -2825,8 +2887,7 @@ body {
background-color: #eeeeee; }
.o-map[class*=o-media-l-m] .awesomplete > ul {
max-width: calc(100% + 2rem);
min-width: calc(100% + 2rem);
top: 2.25rem; }
min-width: calc(100% + 2rem); }
.o-map .o-search-wrapper {
max-width: calc(100% - 8rem);
width: 310px; }
Expand Down Expand Up @@ -3145,19 +3206,21 @@ body {
.o-map[class*=o-media-l-m-s] .sidebarcontainer {
left: 5em;
transform: none; }
.o-map .validate > .errorMsg {
.o-map .groupfootercontainer {
margin-left: 36px; }
.o-map .validate .errorMsg {
color: #ff9500; }
.o-map .validate > input:optional {
.o-map .validate input:optional {
border-color: #ebebeb; }
.o-map .validate > input:required:invalid {
.o-map .validate input:required:invalid {
border-color: #ff9500; }
.o-map .validate > input:invalid {
.o-map .validate input:invalid {
border-color: #ff9500; }
.o-map .validate > textarea:required:invalid {
.o-map .validate textarea:required:invalid {
border-color: #ff9500; }
.o-map .validate > select:required:invalid {
.o-map .validate select:required:invalid {
border-color: #ff9500; }
.o-map .validate > select:required:invalid {
.o-map .validate select:required:invalid {
border-color: #ff9500; }
.o-map input.awesome:required:invalid {
border-color: #ff9500; }
Expand Down
4 changes: 4 additions & 0 deletions build/css/svg/material-icons.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 4 additions & 3 deletions build/data/origo-cities-3857.geojson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"features": [
{ "type": "Feature", "properties": { "id": 1, "name": "Karlstad" }, "geometry": { "type": "Point", "coordinates": [ 1503136, 8262205 ] } },
{ "type": "Feature", "properties": { "id": 2, "name": "Hallstahammar" }, "geometry": { "type": "Point", "coordinates": [ 1807133, 8313751 ] } },
{ "type": "Feature", "properties": { "id": 3, "name": "Västerås" }, "geometry": { "type": "Point", "coordinates": [ 1841462, 8314392 ] } },
{ "type": "Feature", "properties": { "id": 4, "name": "Eskilstuna" }, "geometry": { "type": "Point", "coordinates": [ 1836807, 8260572 ] } },
{ "type": "Feature", "properties": { "id": 5, "name": "Strängnäs" }, "geometry": { "type": "Point", "coordinates": [ 1894581, 8261118 ] } },
{ "type": "Feature", "properties": { "id": 6, "name": "Enköping" }, "geometry": { "type": "Point", "coordinates": [ 1901643, 8320134 ] } },
Expand All @@ -22,6 +21,8 @@
{ "type": "Feature", "properties": { "id": 17, "name": "Norberg" }, "geometry": { "type": "Point", "coordinates": [ 1773055, 8414134 ] } },
{ "type": "Feature", "properties": { "id": 18, "name": "Avesta" }, "geometry": { "type": "Point", "coordinates": [ 1801204, 8431717 ] } },
{ "type": "Feature", "properties": { "id": 19, "name": "Fagersta" }, "geometry": { "type": "Point", "coordinates": [ 1758647, 8400343 ] } },
{ "type": "Feature", "properties": { "id": 20, "name": "Kristianstad" }, "geometry": { "type": "Point", "coordinates": [ 1575633, 7565358 ] } }
{ "type": "Feature", "properties": { "id": 20, "name": "Kristianstad" }, "geometry": { "type": "Point", "coordinates": [ 1575633, 7565358 ] } },
{ "type": "Feature", "properties": { "id": 21, "name": "Mora" }, "geometry": { "type": "Point", "coordinates": [ 1618908, 8627715 ] } },
{ "type": "Feature", "properties": { "id": 22, "name": "Orsa" }, "geometry": { "type": "Point", "coordinates": [ 1627705, 8653421 ] } }
]
}
}
5 changes: 3 additions & 2 deletions build/data/origo-mask-3857.geojson
View file

Large diffs are not rendered by default.

72 changes: 0 additions & 72 deletions build/js/0.origo.js
View file

This file was deleted.

14 changes: 0 additions & 14 deletions build/js/1.origo.js
View file

This file was deleted.

Loading

0 comments on commit b7284a5

Please sign in to comment.