Skip to content

Commit

Permalink
Release v2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@BAXMYPKA
BAXMYPKA committed Jun 17, 2020
1 parent df71719 commit 04cdd52
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 56 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ First of all it's been developed for Locus Map Pro and Google Earth Pro for desk

The examples of map points displaying for **Locus Map Pro** and **Google Earth Pro**:

<p align="center"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/locusScreenshot420x700.jpg" width="260px" alt="Locus Map point with the photo in description" title="How Locus Map can display a photo right in a point description"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/GEscreenshot1060x700.jpg" width=310px" alt="How Google Earth Pro displays a point description with the photo inside it after it was clicked" title="How Google Earth Pro displays a point description with the photo inside it after it was clicked"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/GEscreenshotPoints1060x700.jpg" width="310px" alt="An example of points icons and names with various colors and sizes on Google Earth satellite map" title="An example of points icons and names with various colors and sizes on Google Earth satellite map">
<p align="center"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/locusMapPhotoPoint.jpg" width="260px" alt="Locus Map point with the photo in description" title="How Locus Map can display a photo right in a point description"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/googleEarthPhoto.jpg" width=310px" alt="How Google Earth Pro displays a point description with the photo inside it after it was clicked" title="How Google Earth Pro displays a point description with the photo inside it after it was clicked"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/googleEarthPoints.jpg" width="310px" alt="An example of points icons and names with various colors and sizes on Google Earth satellite map" title="An example of points icons and names with various colors and sizes on Google Earth satellite map">

[Application releases list](https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/releases)

Expand Down
2 changes: 1 addition & 1 deletion README_ru.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Примеры результатов обработки в **Locus Map Pro** и **Google Earth Pro**:

<p align="center"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/locusScreenshot420x700.jpg" width="260px" alt="Locus Map point with the photo in description" title="Отображение фотографии местности в теле описания точки Locus Map"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/GEscreenshot1060x700.jpg" width=310px" alt="Вывод точки с фотографией местности при нажатии на нее в Google Earth Pro" title="Вывод точки с фотографией местности при нажатии на нее в Google Earth Pro"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/GEscreenshotPoints1060x700.jpg" width="310px" alt="Пример текста и точек с разным цветом и размером на спутниковой карте Google Earth" title="Пример текста и точек с разным цветом и размером на спутниковой карте Google Earth">
<p align="center"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/locusMapPhotoPoint.jpg" width="260px" alt="Locus Map point with the photo in description" title="Отображение фотографии местности в теле описания точки Locus Map"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/googleEarthPhoto.jpg" width=310px" alt="Вывод точки с фотографией местности при нажатии на нее в Google Earth Pro" title="Вывод точки с фотографией местности при нажатии на нее в Google Earth Pro"> <img src="https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/blob/master/src/main/resources/static/img/googleEarthPoints.jpg" width="310px" alt="Пример текста и точек с разным цветом и размером на спутниковой карте Google Earth" title="Пример текста и точек с разным цветом и размером на спутниковой карте Google Earth">
</p>

[Список версий программы](https://github.com/BAXMYPKA/MAP-POINTS-TRIMMER/releases)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>mrbaxmypka.gmail.com</groupId>
<artifactId>Map-Points-Trimmer</artifactId>
<version>2.1</version>
<version>2.2</version>
<name>Map Points Trimmer</name>
<description>The trimmer for custom map points as the client-server application based on Spring Boot</description>
<developers>
Expand Down
39 changes: 7 additions & 32 deletions src/main/resources/static/css/index.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,42 +471,17 @@ input[type=radio] {
transform: translateX(-3em) translateY(-2em) scale(3);
}

.imageInText_horizontal:active {
position: absolute;
top: 0.5%;
bottom: 15%;
left: 5%;
/*right: 5%;*/
width: 90%;
transform: scale(1);
.imageInText:active {
position: relative;
width: 100%;
transform: scale(1) translateY(-5em);
border: rgba(213, 205, 196, 0.6) solid 0.9em;
border-radius: 0.6em;
}

.imageInText_vertical:active {
position: absolute;
top: 0.5%;
bottom: 15%;
left: 65%;
/*right: 5%;*/
width: 30%;
transform: scale(1);
width: 35%;
}

.select_kmlDefault:hover {
background-color: blue;
}

.background {
position: relative;
width: 100%;
height: 100%;
z-index: 3;
background: rgba(188, 188, 135, 0.49);
}

.imageInBackground {
position: absolute;
top: 5%;
bottom: 5%;
left: 5%;
right: 5%;
}
Binary file modified src/main/resources/static/img/googleEarthPhoto.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/static/img/googleEarthPoints.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/main/resources/static/img/locusMapPhotoPoint.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 15 additions & 21 deletions src/main/resources/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,20 +266,6 @@ <h2 th:text="#{html.h2.howToConvert}" class="h2">

<br>

<input id="pointTextColor" class="loadForm_colorInput" name="pointTextColor"
type="color" disabled>
<input id="setPointTextColor" type="checkbox">
<label for="setPointTextColor" class="loadForm__label"
th:text="#{html.label.setPointsTextColor}">
Set point labels text color
</label>
<div class="interrogation" title="Description"
th:title="#{commonMessages.interrogationAsDescription.pointsTextColor}">
?
</div>

<br>

<input id="pointTextOpacity" class="loadForm_percentageInput" name="pointTextOpacity"
type="number" min="0" max="100" step="10" pattern="[0-9]" placeholder="%" disabled>
<input id="setPointTextOpacity" type="checkbox">
Expand All @@ -293,6 +279,20 @@ <h2 th:text="#{html.h2.howToConvert}" class="h2">
</div>

<br>

<input id="pointTextColor" class="loadForm_colorInput" name="pointTextColor"
type="color" disabled>
<input id="setPointTextColor" type="checkbox">
<label for="setPointTextColor" class="loadForm__label"
th:text="#{html.label.setPointsTextColor}">
Set point labels text color
</label>
<div class="interrogation" title="Description"
th:title="#{commonMessages.interrogationAsDescription.pointsTextColor}">
?
</div>

<br>

</fieldset>

Expand Down Expand Up @@ -329,7 +329,7 @@ <h2 th:text="#{html.h2.howToConvert}" class="h2">
<fieldset class="loadForm loadForm__fieldSet loadForm__fieldSet__debugFieldset">

<input type="checkbox" id="debugMode">
<span th:utext="#{html.input.checkbox.debugMode}">Debug mode</span>
<span th:utext="#{html.input.checkbox.debugMode}">Debug mode</span>
</input>

<div id="debugInterrogation" class="interrogation" title="Description"
Expand Down Expand Up @@ -370,12 +370,6 @@ <h2 th:text="#{html.h2.howToConvert}" class="h2">
</div>

</footer>

<div class="background">
<div class="imageInBackground">

</div>
</div>

</div>

Expand Down

0 comments on commit 04cdd52

Please sign in to comment.