Skip to content

Commit

Permalink
merged release/3.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
swinkelmann committed Jul 20, 2017
2 parents b549590 + 5b97107 commit d1dac5e
Show file tree
Hide file tree
Showing 16 changed files with 218 additions and 55 deletions.
25 changes: 24 additions & 1 deletion CHANGELOG.md
@@ -1,5 +1,29 @@
# Changelog

* **v.3.0.6.2** - 2017-07-20
- Fix create legend URL
- Merge pull request #572 from mapbender/fix/wrong-scaleHint-in-sublayers
- Fix layer instance administration form sizes Closes: #559
- Merge pull request #545 from mapbender/hotfix/imagepathCommand-530
- Merge pull request #553 from mapbender/hotfix/featureinfo-print-trans-button
- Add output for better UX
- Revert commit d11dd2fd1bde139225a388ddb6d125cb24562260
- Merge pull request #570 from mapbender/fix/ruler-unmatching-value-app-backend
- Reverse to old getScaleRecursive-function in WmsLayerSource because of regression bug. Now correct scale and scale hint for sublayer are set
- Change default value for immediate messurment to null and add check if value is set
- Merge pull request #563 from mapbender/hotfix/epsg-code-list
- added EPSG:4839 and EPSG:5243 to the list
- changed trans variable for print button mb.core.featureinfo.popup.btn.print
- changed trans variable for print button mb.core.featureinfo.error.noresult
- Fix FeatureInfo print translations
- Fix initialize search router Closes: #543
- Added Command to update old imagepath of map element / Fix OpenLayers2 image path #530
- Merge pull request #551 from mapbender/fix/search-router-autoclose-after-click
- remove 'move' check on click event
- Add spaces behind foreach and if to satisfy code quality standards
- Remove unused element generator code. Add documentation
- Added reverse axis default for EPSG:31466

* **v.3.0.6.1** - 2017-05-24
- PrintService/ImageExport: Accept all kinds of image/jpeg and image/gif from wms
- Refactor print scale bugfix
Expand All @@ -17,7 +41,6 @@
- Fix WmsLayerSource modificators
- Fix save Style, VendorSpecific and WmsLayerSource entities


* **v3.0.6.0** - 2017-05-05

- Fix transalate element titles by import Closes: https://github.com/mapbender/mapbender-starter/issues/46
Expand Down
77 changes: 77 additions & 0 deletions src/Mapbender/CoreBundle/Command/DatabaseUpgradeCommand.php
@@ -0,0 +1,77 @@
<?php

namespace Mapbender\CoreBundle\Command;

use Doctrine\ORM\EntityManager;
use Mapbender\CoreBundle\Entity\Element;
use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Helper\ProgressBar;

/**
* Class DatabaseUpgradeCommand
*
*/
class DatabaseUpgradeCommand extends ContainerAwareCommand {

protected function configure() {
$this
->setHelp('The <info>mapbender:database:upgrade</info> command updates the Datesbase to the new schema of mapbender version 3.0.6')
->setName('mapbender:database:upgrade')
->setDescription('Updates database scheme');
}


/**
* Execute command
* @Todo Add logic to execute different action depended on the used MB3 Version
* @param InputInterface $input
* @param OutputInterface $output
* @return int|null|void
*/

protected function execute(InputInterface $input, OutputInterface $output) {
$this->changeMapsImagePath($input, $output);
}

/**
* Change imagesPath configuration value from all MB3 map elements in the database
* from "bundles/mapbendercore/mapquery/lib/openlayers/img"
* to "components/mapquery/lib/openlayers/img"
*/
protected function changeMapsImagePath(InputInterface $input, OutputInterface $output){

/**
* @var EntityManager $em
* @var Element $map
*/
$doctrine=$this->getContainer()->get('doctrine');
$em = $doctrine->getManager();
$maps = $em->getRepository('MapbenderCoreBundle:Element')->findBy(array('class'=>'Mapbender\CoreBundle\Element\Map'));
$output->writeln('Updating map elements image path values');
$output->writeln('Found ' . count($maps) . ' map elements');
$progressBar = new ProgressBar($output, count($maps) );
foreach ($maps as $map) {
$config = $map->getConfiguration();
$progressBar->advance();
if ($config['imgPath'] == 'bundles/mapbendercore/mapquery/lib/openlayers/img') {
$progressBar->setMessage('Found old image path');
$config['imgPath']= 'components/mapquery/lib/openlayers/img';
$map->setConfiguration($config);
$em->persist($map);
$progressBar->setMessage('Old image path successfully changed');
} else {
$progressBar->setMessage('Map element already up-to-date');
}
}
$em->flush();
$progressBar->finish();
$output->writeln('');
$output->writeln('All image path values are now up-to-date');
$output->writeln('Exiting now');
}
}

5 changes: 1 addition & 4 deletions src/Mapbender/CoreBundle/Element/FeatureInfo.php
Expand Up @@ -110,10 +110,7 @@ public static function listAssets()
'css' => array(
'@MapbenderCoreBundle/Resources/public/sass/element/featureinfo.scss'
),
'trans' => array(
'MapbenderCoreBundle:Element:featureinfo.json.twig',
'MapbenderCoreBundle:Element:printclient.json.twig'
)
'trans' => array('MapbenderCoreBundle:Element:featureinfo.json.twig')
);
}

Expand Down
2 changes: 2 additions & 0 deletions src/Mapbender/CoreBundle/Resources/proj4/proj4js_epsg.txt
Expand Up @@ -2452,6 +2452,8 @@
EPSG:4812|New Beijing / 3-degree Gauss-Kruger CM 132E|+proj=tmerc +lat_0=0 +lon_0=132 +k=1 +x_0=500000 +y_0=0 +ellps=krass +units=m +no_defs
EPSG:4822|New Beijing / 3-degree Gauss-Kruger CM 135E|+proj=tmerc +lat_0=0 +lon_0=135 +k=1 +x_0=500000 +y_0=0 +ellps=krass +units=m +no_defs
EPSG:4826|WGS 84 / Cape Verde National|+proj=lcc +lat_1=15 +lat_2=16.66666666666667 +lat_0=15.83333333333333 +lon_0=-24 +x_0=161587.83 +y_0=128511.202 +datum=WGS84 +units=m +no_defs
EPSG:4839|ETRS89 / LCC Germany (N-E)|+proj=lcc +lat_1=48.66666666666666 +lat_2=53.66666666666666 +lat_0=51 +lon_0=10.5 +x_0=0 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs
EPSG:5243|ETRS89 / LCC Germany (E-N)|+proj=lcc +lat_1=48.66666666666666 +lat_2=53.66666666666666 +lat_0=51 +lon_0=10.5 +x_0=0 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs
EPSG:20004|Pulkovo 1995 / Gauss-Kruger zone 4|+proj=tmerc +lat_0=0 +lon_0=21 +k=1 +x_0=4500000 +y_0=0 +ellps=krass +towgs84=24.82,-131.21,-82.66,-0,-0,0.16,-0.12 +units=m +no_defs
EPSG:20005|Pulkovo 1995 / Gauss-Kruger zone 5|+proj=tmerc +lat_0=0 +lon_0=27 +k=1 +x_0=5500000 +y_0=0 +ellps=krass +towgs84=24.82,-131.21,-82.66,-0,-0,0.16,-0.12 +units=m +no_defs
EPSG:20006|Pulkovo 1995 / Gauss-Kruger zone 6|+proj=tmerc +lat_0=0 +lon_0=33 +k=1 +x_0=6500000 +y_0=0 +ellps=krass +towgs84=24.82,-131.21,-82.66,-0,-0,0.16,-0.12 +units=m +no_defs
Expand Down
Expand Up @@ -413,7 +413,7 @@
if (options.printResult === true) {
widget.popup.addButtons({
'print': {
label: Mapbender.trans('mb.core.printclient.popup.btn.ok'),
label: Mapbender.trans('mb.core.featureinfo.popup.btn.print'),
cssClass: 'button right',
callback: function() {
widget._printContent();
Expand Down
Expand Up @@ -7,7 +7,7 @@
icon: undefined,
label: true,
group: undefined,
immediate: true,
immediate: null,
persist: true,
type: 'line',
precision: 2
Expand Down Expand Up @@ -41,7 +41,7 @@

var handler = (this.options.type === 'line' ? OpenLayers.Handler.Path :
OpenLayers.Handler.Polygon);

var immediate = this.options.immediate || false;
this.control = new OpenLayers.Control.Measure(handler, {
callbacks: {
modify: function(point, feature, drawing){
Expand All @@ -64,7 +64,7 @@
}
},
persist: this.options.persist,
immediate: this.options.immediate,
immediate: immediate,
geodesic: this._isGeodesic()
});

Expand Down
Expand Up @@ -8,6 +8,7 @@ mb:
popup:
btn:
ok: Schließen
print: Drucken
class:
title: Information
description: Information
Expand Down
Expand Up @@ -8,6 +8,7 @@ mb:
popup:
btn:
ok: Close
print: Print
class:
title: FeatureInfo
description: FeatureInfo
Expand Down
Expand Up @@ -8,6 +8,7 @@ mb:
popup:
btn:
ok: Cerrar
print: Imprimir
class:
title: FeatureInfo
description: FeatureInfo
Expand Down
Expand Up @@ -8,6 +8,7 @@ mb:
popup:
btn:
ok: Fechar
print: Imprimir
class:
title: Informação
description: Informação
Expand Down
Expand Up @@ -8,6 +8,7 @@ mb:
popup:
btn:
ok: Закрыть
print: Печать
class:
title: Инфосвойства
description: Инфосвойства
Expand Down
@@ -1,6 +1,7 @@
{
"mb.core.metadata.popup.title": "{{ "mb.core.metadata.popup.title" | trans }}",
"mb.core.featureinfo.popup.btn.ok": "{{ "mb.core.featureinfo.popup.btn.ok" | trans }}",
"mb.core.featureinfo.popup.btn.print": "{{ "mb.core.featureinfo.popup.btn.print" | trans }}",
"mb.core.featureinfo.error.nolayer": "{{"mb.core.featureinfo.error.nolayer" | trans}}",
"mb.core.featureinfo.error.noresult": "{{"mb.core.featureinfo.error.noresult" | trans}}"
}
Expand Up @@ -203,7 +203,26 @@
.checkboxColumn{text-align:center;}
.odd{background-color:darken($contentColor, 6%);}

thead .checkboxColumn{padding:0px;}
&.table {
> thead > tr > .checkboxColumn {
padding-left: 2px;
padding-right: 2px;
}
> tbody > tr > td {
&.titleColumn {
width: 260px;
}
&.itemType {
padding-right: 0;
padding-left: 0;
}
&.minScaleColumn,
&.maxScaleColumn {
padding-left: 4px;
}
}
}

tbody{
.dropdown{min-width:100%;}
.minScaleColumn, .maxScaleColumn, .styleColumn{width:80px;}
Expand Down

0 comments on commit d1dac5e

Please sign in to comment.