@mapcomponents/react-maplibre 0.1.8 → 0.1.12

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,10 +9,10 @@ labels: 'Status: Unconfirmed'
 <!--
   Please provide a clear and concise description of what the bug is. Include
   screenshots if needed. Please test using the latest version of the relevant
-  react-map-components-maplibre package to make sure your issue has not already been fixed.
+  @mapcomponents/react-maplibre package to make sure your issue has not already been fixed.
 -->
 
-react-map-components-maplibre version:
+@mapcomponents/react-maplibre version:
 
 ## Steps To Reproduce
 

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,6 +1,6 @@
 ---
-name: "🫀 Feature request"
-about: Suggest a new idea for react-map-components-maplibre.
+name: "💕 Feature request"
+about: Suggest a new idea for @mapcomponents/react-maplibre.
 title: 'Feature: '
 labels: 'Status: needs print'
 Assignees: ''
@@ -11,7 +11,7 @@ Assignees: ''
 -->
 
 
-react-map-components-maplibre version:
+@mapcomponents/react-maplibre version:
 
 ## Feature description
 

package/.github/workflows/node_version_test.yml

@@ -0,0 +1,25 @@
+name: tests
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-versions: [10.x, 12.x, 14.x, 15.x, 16.x]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+      # Setup .npmrc file to publish to npm
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn
+      - run: yarn test:noninteractive

package/.github/workflows/storybook.yml

@@ -1,4 +1,4 @@
-name: Build and Deploy Storybook
+name: Build and deploy storybook
 on: 
   [push]
 jobs:
@@ -9,10 +9,13 @@ jobs:
         uses: actions/checkout@v2.3.1
         with:
           persist-credentials: false
-      - name: Install and Build 🔧
+      - name: Install and build 🔧
         run: | # Install packages and build the Storybook files
-          yarn install
+          yarn
+          yarn build-catalogue-meta
+          yarn build-catalogue-markdown-docs
           yarn build-storybook
+          npx sb extract ./docs-build ./docs-build/stories.json
       - name: Deploy 🚀
         uses: JamesIves/github-pages-deploy-action@3.6.2
         with:

package/CODE_OF_CONDUCT.md

@@ -0,0 +1,70 @@
+# Code of Conduct - react-map-components-maplibre
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, or to ban
+temporarily or permanently any contributor for other behaviors that they deem
+inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at <info@wheregroup.com>.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant](https://contributor-covenant.org/), version
+[1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct/code_of_conduct.md) and
+[2.0](https://www.contributor-covenant.org/version/2/0/code_of_conduct/code_of_conduct.md),
+and was generated by [contributing-gen](https://github.com/bttger/contributing-gen).

package/CONTRIBUTING.md

@@ -0,0 +1,149 @@
+<!-- omit in toc -->
+# Contributing to react-map-components-maplibre
+
+First off, thanks for taking the time to contribute! ❤️
+
+All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
+
+> And if you like theut it project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
+> - Star the project
+> - Tweet about it
+> - Refer this project in your project's readme
+> - Mention the project at local meetups and tell your friends/colleagues
+
+<!-- omit in toc -->
+## Table of Contents
+
+- [Code of Conduct](#code-of-conduct)
+- [I Have a Question](#i-have-a-question)
+- [I Want To Contribute](#i-want-to-contribute)
+  - [Reporting Bugs](#reporting-bugs)
+  - [Suggesting Enhancements](#suggesting-enhancements)
+
+
+## Code of Conduct
+
+This project and everyone participating in it is governed by the
+[react-map-components-maplibre Code of Conduct](https://github.com/mapcomponents/react-map-components-maplibre/blob/master/CODE_OF_CONDUCT.md).
+By participating, you are expected to uphold this code. Please report unacceptable behavior
+to <info@wheregroup.com>.
+
+
+## I Have a Question
+
+> If you want to ask a question, we assume that you have read the available [Documentation](https://mapcomponents.github.io/react-map-components-maplibre).
+
+Before you ask a question, it is best to search for existing [Issues](https://github.com/mapcomponents/react-map-components-maplibre/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
+
+If you then still feel the need to ask a question and need clarification, we recommend the following:
+
+- Open an [Issue](https://github.com/mapcomponents/react-map-components-maplibre/issues/new).
+- Provide as much context as you can about what you're running into.
+- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.
+
+We will then take care of the issue as soon as possible.
+
+<!--
+You might want to create a separate issue tag for questions and include it in this description. People should then tag their issues accordingly.
+
+Depending on how large the project is, you may want to outsource the questioning, e.g. to Stack Overflow or Gitter. You may add additional contact and information possibilities:
+- IRC
+- Slack
+- Gitter
+- Stack Overflow tag
+- Blog
+- FAQ
+- Roadmap
+- E-Mail List
+- Forum
+-->
+
+## I Want To Contribute
+
+> ### Legal Notice <!-- omit in toc -->
+> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
+
+### Reporting Bugs
+
+<!-- omit in toc -->
+#### Before Submitting a Bug Report
+
+A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
+
+- Make sure that you are using the latest version.
+- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](https://mapcomponents.github.io/react-map-components-maplibre/). If you are looking for support, you might want to check [this section](#i-have-a-question)).
+- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/mapcomponents/react-map-components-maplibre/issues?q=label%3Abug).
+- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
+- Collect information about the bug:
+  - Stack trace (Traceback)
+  - OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
+  - Version of the interpreter, compiler, SDK, runtime environment, package manager, depending on what seems relevant.
+  - Possibly your input and the output
+  - Can you reliably reproduce the issue? And can you also reproduce it with older versions?
+
+<!-- omit in toc -->
+#### How Do I Submit a Good Bug Report?
+
+> You must never report security related issues, vulnerabilities or bugs to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to <info@wheregroup.com>.
+<!-- You may add a PGP key to allow the messages to be sent encrypted as well. -->
+
+We use GitHub issues to track bugs and errors. If you run into an issue with the project:
+
+- Open an [Issue](https://github.com/mapcomponents/react-map-components-maplibre/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
+- Explain the behavior you would expect and the actual behavior.
+- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
+- Provide the information you collected in the previous section.
+
+Once it's filed:
+
+- The project team will label the issue accordingly.
+- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
+- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#your-first-code-contribution).
+
+<!-- You might want to create an issue template for bugs and errors that can be used as a guide and that defines the structure of the information to be included. If you do so, reference it here in the description. -->
+
+
+### Suggesting Enhancements
+
+This section guides you through submitting an enhancement suggestion for react-map-components-maplibre, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
+
+<!-- omit in toc -->
+#### Before Submitting an Enhancement
+
+- Make sure that you are using the latest version.
+- Read the [documentation](https://mapcomponents.github.io/react-map-components-maplibre) carefully and find out if the functionality is already covered, maybe by an individual configuration.
+- Perform a [search](https://github.com/mapcomponents/react-map-components-maplibre/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
+- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
+
+<!-- omit in toc -->
+#### How Do I Submit a Good Enhancement Suggestion?
+
+Enhancement suggestions are tracked as [GitHub issues](https://github.com/mapcomponents/react-map-components-maplibre/issues).
+
+- Use a **clear and descriptive title** for the issue to identify the suggestion.
+- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
+- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
+- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. <!-- this should only be included if the project has a GUI -->
+- **Explain why this enhancement would be useful** to most react-map-components-maplibre users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
+
+<!-- You might want to create an issue template for enhancement suggestions that can be used as a guide and that defines the structure of the information to be included. If you do so, reference it here in the description. -->
+
+<!-- TODO
+### Your First Code Contribution
+include Setup of env, IDE and typical getting started instructions?
+
+
+### Improving The Documentation
+Updating, improving and correcting the documentation
+
+
+## Styleguides
+### Commit Messages
+
+
+## Join The Project Team
+<!-- TODO -->
+
+<!-- omit in toc -->
+## Attribution
+This guide is based on the **contributing-gen**. [Make your own](https://github.com/bttger/contributing-gen)!

package/README.md

@@ -2,9 +2,12 @@
 
 # [MapComponents MapLibre](https://mapcomponents.org/)
 
-[![npm version](https://badge.fury.io/js/react-map-components-maplibre.svg)](https://badge.fury.io/js/react-map-components-maplibre) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) ![downloads](https://img.shields.io/npm/dt/react-map-components-maplibre.svg) ![downloads](https://img.shields.io/npm/dm/react-map-components-maplibre.svg)
+[![npm version](https://badge.fury.io/js/@mapcomponents%2Freact-maplibre.svg)](https://badge.fury.io/js/@mapcomponents%2Freact-maplibre) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) ![downloads](https://img.shields.io/npm/dt/@mapcomponents%2Freact-maplibre.svg) ![downloads](https://img.shields.io/npm/dm/@mapcomponents%2Freact-maplibre.svg)
 
-## Getting started
+![Tests](https://github.com/mapcomponents/react-map-components-maplibre/actions/workflows/node_version_test.yml/badge.svg)
+
+
+## Getting started (Using the storybook dev server)
 
 1. Clone the repository and ```cd``` into the folder 
 2. Run ```yarn``` to install all dependencies.
@@ -21,6 +24,17 @@
 1. Follow all steps of "Create a new component"
 2. Change the value of the property "type" in {component_name}.meta.json to "application"
 
+## Project setup
+
+### Starting a new project
+
+Fork our codesandbox project setup template to get started instantly. https://codesandbox.io/s/base-template-n0vp9
+
+### Integrate MapComponents into an existing react project
+
+1. Add the dependency ```yarn add @mapcomponents/react-maplibre```
+2. Add a MapcomponentsProvider to your react-dom (e.g.  https://codesandbox.io/s/base-template-n0vp9?file=/src/index.js)
+3. Add a MapLibreMap and any MapComponent you like to use in your app below MapcomponentsProvider.
 ## Anatomy of a MapComponent
 
 A MapComponent is a react component that accepts at least 1 attribute "mapId" (there are some exceptions) and is expected to retrieve a maplibre-gl instance from mapContext and directly manipulate it or watch its state. 
@@ -135,13 +149,6 @@ Example implementation of a component in context with all required dependent com
 
 More information on writing storybook stories for react components: https://storybook.js.org/docs/react/get-started/browse-stories
 
-## LoadingOverlay and LoadingOverlayProvider (currently located in ./ui_components/)
-
-The loading overlay component is added in the storybook decorator.
-Without any further configuration it will listen for new MapLibre instances registered in MapContext and fade out once all of them have fired an "idle" event. For more precise control the LoadingOverlayContext provides a ```loadingOverlayContext.setControlled(true)``` function that will, if called with true as first parameter, switch the LoadingOverlay to manual control. Once the application has loaded completely call the ```loadingOverlayContext.setLoadingDone(true)``` function to trigger the LoadingOverlay Component to fade out.
-
-For decorator integration examples check the storybook decorators located in ./decorators/.
-
 # Tests
 
 ```

package/coverage/clover.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1637853048003" clover="3.2.0">
-  <project timestamp="1637853048004" name="All files">
-    <metrics statements="1505" coveredstatements="559" conditionals="829" coveredconditionals="252" methods="259" coveredmethods="91" elements="2593" coveredelements="902" complexity="0" loc="1505" ncloc="1505" packages="25" files="28" classes="28"/>
+<coverage generated="1638615355631" clover="3.2.0">
+  <project timestamp="1638615355631" name="All files">
+    <metrics statements="1509" coveredstatements="562" conditionals="831" coveredconditionals="253" methods="258" coveredmethods="91" elements="2598" coveredelements="906" complexity="0" loc="1509" ncloc="1509" packages="25" files="28" classes="28"/>
     <package name="components.MapLibreMap">
       <metrics statements="25" coveredstatements="25" conditionals="4" coveredconditionals="3" methods="6" coveredmethods="6"/>
       <file name="MapLibreMap.js" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/components/MapLibreMap/MapLibreMap.js">
@@ -136,9 +136,9 @@
       </file>
     </package>
     <package name="components.MlFollowGps">
-      <metrics statements="38" coveredstatements="26" conditionals="22" coveredconditionals="13" methods="7" coveredmethods="4"/>
+      <metrics statements="40" coveredstatements="27" conditionals="22" coveredconditionals="13" methods="7" coveredmethods="4"/>
       <file name="MlFollowGps.js" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/components/MlFollowGps/MlFollowGps.js">
-        <metrics statements="38" coveredstatements="26" conditionals="22" coveredconditionals="13" methods="7" coveredmethods="4"/>
+        <metrics statements="40" coveredstatements="27" conditionals="22" coveredconditionals="13" methods="7" coveredmethods="4"/>
         <line num="21" count="1" type="stmt"/>
         <line num="23" count="7" type="stmt"/>
         <line num="24" count="7" type="stmt"/>
@@ -148,35 +148,37 @@
         <line num="29" count="7" type="stmt"/>
         <line num="30" count="7" type="stmt"/>
         <line num="31" count="7" type="cond" truecount="1" falsecount="1"/>
-        <line num="33" count="7" type="stmt"/>
-        <line num="34" count="2" type="stmt"/>
-        <line num="37" count="2" type="stmt"/>
-        <line num="44" count="0" type="cond" truecount="0" falsecount="2"/>
-        <line num="45" count="0" type="stmt"/>
+        <line num="32" count="7" type="stmt"/>
+        <line num="34" count="7" type="stmt"/>
+        <line num="35" count="2" type="stmt"/>
+        <line num="38" count="2" type="stmt"/>
+        <line num="45" count="0" type="cond" truecount="0" falsecount="2"/>
         <line num="46" count="0" type="stmt"/>
-        <line num="48" count="0" type="cond" truecount="0" falsecount="2"/>
-        <line num="49" count="0" type="stmt"/>
+        <line num="47" count="0" type="stmt"/>
+        <line num="49" count="0" type="cond" truecount="0" falsecount="2"/>
         <line num="50" count="0" type="stmt"/>
         <line num="51" count="0" type="stmt"/>
-        <line num="56" count="7" type="stmt"/>
-        <line num="57" count="4" type="cond" truecount="4" falsecount="0"/>
-        <line num="60" count="2" type="stmt"/>
+        <line num="52" count="0" type="stmt"/>
+        <line num="57" count="7" type="stmt"/>
+        <line num="58" count="4" type="cond" truecount="4" falsecount="0"/>
         <line num="61" count="2" type="stmt"/>
         <line num="62" count="2" type="stmt"/>
-        <line num="66" count="7" type="stmt"/>
-        <line num="67" count="0" type="cond" truecount="0" falsecount="2"/>
-        <line num="68" count="0" type="stmt"/>
+        <line num="63" count="2" type="stmt"/>
+        <line num="67" count="7" type="stmt"/>
+        <line num="68" count="0" type="cond" truecount="0" falsecount="2"/>
         <line num="69" count="0" type="stmt"/>
-        <line num="72" count="7" type="stmt"/>
-        <line num="73" count="0" type="stmt"/>
-        <line num="74" count="0" type="stmt"/>
-        <line num="77" count="7" type="stmt"/>
-        <line num="111" count="3" type="cond" truecount="2" falsecount="0"/>
-        <line num="112" count="1" type="stmt"/>
-        <line num="114" count="2" type="stmt"/>
-        <line num="119" count="3" type="stmt"/>
-        <line num="129" count="1" type="stmt"/>
-        <line num="146" count="1" type="stmt"/>
+        <line num="70" count="0" type="stmt"/>
+        <line num="71" count="0" type="stmt"/>
+        <line num="74" count="7" type="stmt"/>
+        <line num="75" count="0" type="stmt"/>
+        <line num="76" count="0" type="stmt"/>
+        <line num="79" count="7" type="stmt"/>
+        <line num="124" count="3" type="cond" truecount="2" falsecount="0"/>
+        <line num="125" count="1" type="stmt"/>
+        <line num="127" count="2" type="stmt"/>
+        <line num="132" count="3" type="stmt"/>
+        <line num="142" count="1" type="stmt"/>
+        <line num="159" count="1" type="stmt"/>
       </file>
     </package>
     <package name="components.MlGPXViewer">
@@ -588,9 +590,9 @@
       </file>
     </package>
     <package name="components.MlGeoJsonLayer">
-      <metrics statements="56" coveredstatements="37" conditionals="48" coveredconditionals="27" methods="8" coveredmethods="6"/>
+      <metrics statements="58" coveredstatements="39" conditionals="50" coveredconditionals="28" methods="7" coveredmethods="6"/>
       <file name="MlGeoJsonLayer.js" path="/home/runner/work/react-map-components-maplibre/react-map-components-maplibre/src/components/MlGeoJsonLayer/MlGeoJsonLayer.js">
-        <metrics statements="56" coveredstatements="37" conditionals="48" coveredconditionals="27" methods="8" coveredmethods="6"/>
+        <metrics statements="58" coveredstatements="39" conditionals="50" coveredconditionals="28" methods="7" coveredmethods="6"/>
         <line num="10" count="2" type="stmt"/>
         <line num="17" count="2" type="stmt"/>
         <line num="19" count="8" type="stmt"/>
@@ -602,51 +604,53 @@
         <line num="25" count="8" type="stmt"/>
         <line num="26" count="8" type="stmt"/>
         <line num="27" count="8" type="stmt"/>
-        <line num="30" count="8" type="cond" truecount="2" falsecount="0"/>
-        <line num="32" count="8" type="stmt"/>
-        <line num="33" count="4" type="stmt"/>
+        <line num="28" count="8" type="stmt"/>
+        <line num="31" count="8" type="cond" truecount="2" falsecount="0"/>
+        <line num="33" count="8" type="stmt"/>
         <line num="34" count="4" type="stmt"/>
-        <line num="36" count="2" type="cond" truecount="1" falsecount="1"/>
-        <line num="37" count="2" type="stmt"/>
-        <line num="39" count="2" type="stmt"/>
-        <line num="44" count="8" type="stmt"/>
-        <line num="45" count="8" type="cond" truecount="2" falsecount="2"/>
-        <line num="49" count="0" type="stmt"/>
-        <line num="50" count="0" type="stmt"/>
-        <line num="54" count="8" type="stmt"/>
-        <line num="56" count="0" type="stmt"/>
-        <line num="72" count="8" type="stmt"/>
-        <line num="73" count="8" type="cond" truecount="2" falsecount="2"/>
-        <line num="77" count="0" type="cond" truecount="0" falsecount="2"/>
-        <line num="82" count="0" type="stmt"/>
-        <line num="83" count="0" type="stmt"/>
-        <line num="84" count="0" type="stmt"/>
-        <line num="85" count="0" type="stmt"/>
-        <line num="86" count="0" type="stmt"/>
+        <line num="35" count="4" type="stmt"/>
+        <line num="37" count="2" type="cond" truecount="1" falsecount="1"/>
+        <line num="38" count="0" type="stmt"/>
+        <line num="40" count="2" type="cond" truecount="1" falsecount="1"/>
+        <line num="42" count="2" type="stmt"/>
+        <line num="44" count="2" type="stmt"/>
+        <line num="49" count="8" type="stmt"/>
+        <line num="50" count="8" type="cond" truecount="2" falsecount="2"/>
+        <line num="54" count="0" type="stmt"/>
+        <line num="55" count="0" type="stmt"/>
+        <line num="59" count="8" type="stmt"/>
+        <line num="61" count="0" type="stmt"/>
+        <line num="78" count="8" type="stmt"/>
+        <line num="79" count="8" type="cond" truecount="2" falsecount="2"/>
+        <line num="83" count="0" type="cond" truecount="0" falsecount="2"/>
         <line num="88" count="0" type="stmt"/>
+        <line num="89" count="0" type="stmt"/>
         <line num="90" count="0" type="stmt"/>
-        <line num="100" count="8" type="stmt"/>
-        <line num="101" count="8" type="cond" truecount="4" falsecount="0"/>
-        <line num="105" count="4" type="cond" truecount="1" falsecount="1"/>
-        <line num="106" count="4" type="stmt"/>
-        <line num="107" count="4" type="stmt"/>
-        <line num="109" count="4" type="cond" truecount="1" falsecount="1"/>
-        <line num="115" count="0" type="stmt"/>
-        <line num="116" count="0" type="stmt"/>
-        <line num="119" count="4" type="stmt"/>
-        <line num="121" count="4" type="stmt"/>
-        <line num="138" count="4" type="cond" truecount="1" falsecount="1"/>
-        <line num="139" count="0" type="stmt"/>
-        <line num="142" count="4" type="cond" truecount="1" falsecount="1"/>
-        <line num="143" count="0" type="stmt"/>
-        <line num="146" count="4" type="cond" truecount="1" falsecount="1"/>
-        <line num="147" count="0" type="stmt"/>
-        <line num="150" count="4" type="cond" truecount="1" falsecount="1"/>
-        <line num="155" count="0" type="stmt"/>
-        <line num="156" count="0" type="stmt"/>
-        <line num="157" count="0" type="stmt"/>
-        <line num="163" count="8" type="stmt"/>
-        <line num="166" count="2" type="stmt"/>
+        <line num="91" count="0" type="stmt"/>
+        <line num="92" count="0" type="stmt"/>
+        <line num="94" count="0" type="stmt"/>
+        <line num="96" count="0" type="stmt"/>
+        <line num="106" count="8" type="stmt"/>
+        <line num="107" count="8" type="cond" truecount="4" falsecount="0"/>
+        <line num="111" count="4" type="cond" truecount="1" falsecount="1"/>
+        <line num="112" count="4" type="stmt"/>
+        <line num="113" count="4" type="stmt"/>
+        <line num="115" count="4" type="cond" truecount="1" falsecount="1"/>
+        <line num="121" count="0" type="stmt"/>
+        <line num="122" count="0" type="stmt"/>
+        <line num="125" count="4" type="stmt"/>
+        <line num="127" count="4" type="stmt"/>
+        <line num="144" count="4" type="cond" truecount="1" falsecount="1"/>
+        <line num="145" count="0" type="stmt"/>
+        <line num="148" count="4" type="cond" truecount="1" falsecount="1"/>
+        <line num="149" count="0" type="stmt"/>
+        <line num="152" count="4" type="cond" truecount="1" falsecount="1"/>
+        <line num="153" count="0" type="stmt"/>
+        <line num="156" count="4" type="cond" truecount="1" falsecount="1"/>
+        <line num="161" count="0" type="stmt"/>
+        <line num="162" count="0" type="stmt"/>
+        <line num="167" count="8" type="stmt"/>
+        <line num="170" count="2" type="stmt"/>
       </file>
     </package>
     <package name="components.MlImageMarkerLayer">