addressmarker

agosms-update4.xml

@@ -105,4 +105,25 @@
         <sha256>c963ae798e308048f5a6f74ba0a58f1992b8d2e2c14668ec40a91ee78fcb8ba2</sha256>
         <sha384>ac6b52d219a49e341b091f0143d5bb45514cf9fdb304d1e7aa99b05f6d707b911cb3c1999b87ae83092e0f7f045607f9</sha384>
     </update>
+    <update>
+        <name>pkg_agosms</name>
+        <description>pkg_agosms</description>
+        <element>pkg_agosms</element>
+        <type>package</type>
+        <client>site</client>
+        <version>4.0.15</version>
+        <infourl title="agosms">https://github.com/astridx/pkg_agosms/blob/v4.0.15/README.md</infourl>
+        <downloads>
+            <downloadurl type="full" format="zip">https://github.com/astridx/pkg_agosms/releases/download/v4.0.15/pkg-agosms-4.0.15.zip</downloadurl>
+        </downloads>
+        <tags>
+            <tag>rc</tag>
+            <tag>stable</tag>
+        </tags>
+        <maintainer>Astrid Günther</maintainer>
+        <maintainerurl>https://astrid-guenther.de</maintainerurl>
+        <targetplatform name="joomla" version="4.*"/>
+        <sha256>ff75458971412ce21c5cd1dc063112ccdd62f2560270d8a4905e153ce29cd22d</sha256>
+        <sha384>da6fe539ea5d84e097483880fa6f710534ab00a5ef9bc41521b9abc2a63074ad5be986900e32bf00bf82a32098e94882</sha384>
+    </update>
 </updates>

changelog.xml

@@ -69,4 +69,38 @@
 			<item>Add mod_agosmsmt.</item>
 		</note>
 	</changelog>	
+	<changelog>
+		<element>pkg_agosms</element>
+		<type>package</type>
+		<version>4.0.13</version>
+		<note>
+			<item>Fixes and improvments in mod_agosmsmt.</item>
+		</note>
+	</changelog>	
+	<changelog>
+		<element>pkg_agosms</element>
+		<type>package</type>
+		<version>4.0.14</version>
+		<note>
+			<item>Add Layer Tree (for satellite) in module agosms.</item>
+			<item>Make separators more visible in the backend</item>
+		</note>
+	</changelog>	
+	<changelog>
+		<element>pkg_agosms</element>
+		<type>package</type>
+		<version>4.0.15</version>
+		<note>
+			<item>Agosmsaddressmarker Field: Make the separators more visible in the backend.</item>
+			<item>Agosmsaddressmarker Field: Change the maximum default values for lat and lon to the largest possible values.</item>
+			<item>Agosmsaddressmarker Field: Add possibility to add a field for popup text.</item>
+		</note>
+	</changelog>	
+	<changelog>
+		<element>pkg_agosms</element>
+		<type>package</type>
+		<version>4.0.16</version>
+		<note>
+		</note>
+	</changelog>	
 </changelogs>

j4/pkg_agosms/jorobo.ini

@@ -1,5 +1,5 @@
 extension = agosms
-version = 4.0.13
+version = 4.0.16
 source = src
 target = package
 

j4/pkg_agosms/src/media/mod_agosm/js/agosm.js

@@ -21,6 +21,8 @@ document.addEventListener('DOMContentLoaded', function () {
 		var moduleId = element.getAttribute('data-module-id');
 		var detectRetina = element.getAttribute('data-detect-retina');
 		var baselayer = element.getAttribute('data-baselayer');
+		var layertree = element.getAttribute('data-layertree');
+
 		var lonlat = element.getAttribute('data-lonlat').split(",", 3);
 		var zoom = element.getAttribute('data-zoom');
 		var disableClusteringAtZoom = element.getAttribute('data-disable-clustering-at-zoom');
@@ -283,6 +285,19 @@ document.addEventListener('DOMContentLoaded', function () {
 
 		tileLayer.addTo(window['mymap' + moduleId]);
 
+		if (layertree == '1') {
+			var tileLayer2 = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
+				maxZoom: 16,
+				attribution: 'Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community',
+				id: ''
+			});
+			var baseMaps = {
+				"Map": tileLayer,
+				"Satellit": tileLayer2
+			};
+			L.control.layers(baseMaps).addTo(window['mymap' + moduleId]);
+		}
+
 		// SCALE CONTROL
 		if ((scale) !== '0') {
 			let aggpxScale = L.control.scale();
@@ -964,6 +979,11 @@ document.addEventListener('DOMContentLoaded', function () {
 					}
 
 					let popuptext = "<a href=' " + url + " '> " + title + " </a>";
+
+					if (objcf.specialpopuptext) {
+						popuptext = objcf.specialpopuptext;
+					}
+
 					tempMarkercf.bindPopup(popuptext.replace(/<img src="images/g, '<img src="' + uriroot + 'images'));
 
 					var clickgmarkerlista = document.querySelector('.agmarkerlista' + objcf.id);

j4/pkg_agosms/src/media/mod_agosm/layerstree/.eslintrc

@@ -0,0 +1,35 @@
+{
+  "globals": {
+    "define": true,
+    "module": true,
+    "L": true
+  },
+  "plugins": [
+    "html"
+  ],
+  "settings": {
+    "html/indent": "space",
+    "html/report-bad-indent": 2
+  },
+  "rules": {
+    "camelcase": "error",
+    "comma-spacing": ["error", {"after": true}],
+    "comma-style": "error",
+    "indent": "error",
+    "key-spacing": "error",
+    "keyword-spacing": "error",
+    "no-console": "error",
+    "no-constant-condition": "off",
+    "no-lonely-if": "error",
+    "no-multi-spaces": "error",
+    "no-shadow": "off",
+    "no-trailing-spaces": "error",
+    "no-underscore-dangle": "off",
+    "object-curly-spacing": "error",
+    "quotes": ["error", "single", "avoid-escape"],
+    "space-before-blocks": "error",
+    "space-before-function-paren": ["error", "never"],
+    "space-in-parens": "error",
+    "strict": "off"
+  }
+}

j4/pkg_agosms/src/media/mod_agosm/layerstree/.github/workflows/main.yml

@@ -0,0 +1,52 @@
+name: CI
+
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [ 14.x ]
+        working-directory: [ '.', './test-types' ]
+
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v2
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Cache node modules
+        uses: actions/cache@v2
+        env:
+          cache-name: cache-node-modules-${{ matrix.working-directory }}
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Install dependencies
+        run: npm ci
+        working-directory: ${{ matrix.working-directory }}
+
+      - name: Run tests
+        run: npm run test
+        working-directory: ${{ matrix.working-directory }}
+        timeout-minutes: 2

j4/pkg_agosms/src/media/mod_agosm/layerstree/.github/workflows/npm-publish.yml

@@ -0,0 +1,29 @@
+name: npm-publish
+
+on:
+  push:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  npm-publish:
+    name: npm-publish
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+    - name: Publish if version has been updated
+      uses: pascalgn/npm-publish-action@1.3.7
+      with: # All of theses inputs are optional
+        tag_name: "v%s"
+        tag_message: "v%s"
+        create_tag: "true"
+        commit_pattern: "^Release (\\S+)"
+        workspace: "."
+        publish_command: "yarn"
+        publish_args: "--non-interactive"
+      env: 
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this as is, it's automatically generated
+        NPM_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} # You need to set this in your repo settings

j4/pkg_agosms/src/media/mod_agosm/layerstree/.npmignore

@@ -0,0 +1,7 @@
+.github
+.travis.yml
+.vscode
+bower.json
+examples
+test
+test-types

j4/pkg_agosms/src/media/mod_agosm/layerstree/L.Control.Layers.Tree.css

@@ -0,0 +1,61 @@
+.leaflet-control-layers-toggle.leaflet-layerstree-named-toggle {
+    margin: 2px 5px;
+    width: auto;
+    height: auto;
+    background-image: none;
+}
+
+.leaflet-layerstree-node {
+}
+
+.leaflet-layerstree-header input{
+    margin-left: 0px;
+}
+
+
+.leaflet-layerstree-header {
+}
+
+.leaflet-layerstree-header-pointer {
+    cursor: pointer;
+}
+
+.leaflet-layerstree-header label {
+    display: inline-block;
+    cursor: pointer;
+}
+
+.leaflet-layerstree-header-label {
+}
+
+.leaflet-layerstree-header-name {
+}
+
+.leaflet-layerstree-header-space {
+}
+
+.leaflet-layerstree-children {
+    padding-left: 10px;
+}
+
+.leaflet-layerstree-children-nopad {
+    padding-left: 0px;
+}
+
+.leaflet-layerstree-closed {
+}
+
+.leaflet-layerstree-opened {
+}
+
+.leaflet-layerstree-hide {
+    display: none;
+}
+
+.leaflet-layerstree-nevershow {
+    display: none;
+}
+
+.leaflet-layerstree-expand-collapse {
+    cursor: pointer;
+}