for ($i=0; $i!=$num_matches; ++$i) {
$result[] = array(floatval($matches[2][$i]), floatval($matches[1][$i]));
}
- if (implode($matches[0]) != $input) throw new Exception('Falsches Koordinatenformat: ' . $input);
+ if (implode($matches[0]) != $input) throw new Exception(wfMessage('wrmap-error-coordinate-format', $input)->text());
return $result;
}
// for NS_FILE titles, use the corresponding file as image
if ($title->getNamespace() == NS_FILE) {
$file = wfFindFile($title); // $file is a mediawiki File class or false
+ } else {
+ $categories = $title->getParentCategories(); // e.g. array('Kategorie:Rodelbahn' => 'Juifenalm')
+ global $wgContLang;
+ $key_sledrun = $wgContLang->getNSText(NS_CATEGORY) . ':Rodelbahn';
+ if (array_key_exists($key_sledrun, $categories)) {
+ // for sledrun titles use the image from the rodelbahnbox
+ $dbr = wfGetDB(DB_SLAVE);
+ $res = $dbr->select('wrsledruncache', 'image', array('page_id' => $title->getArticleID()), __METHOD__);
+ $image = $dbr->fetchRow($res);
+ if ($image && !is_null($image['image'])) $file = wfFindFile($image['image']);
+ $dbr->freeResult($res);
+ }
+ $key_inn = $wgContLang->getNSText(NS_CATEGORY) . ':Gasthaus';
+ if (array_key_exists($key_inn, $categories)) {
+ // for inn titles use the image from the gasthausbox
+ $dbr = wfGetDB(DB_SLAVE);
+ $res = $dbr->select('wrinncache', 'image', array('page_id' => $title->getArticleID()), __METHOD__);
+ $image = $dbr->fetchRow($res);
+ if ($image && !is_null($image['image'])) $file = wfFindFile($image['image']);
+ $dbr->freeResult($res);
+ }
}
if ($file === false) return Null;
if (!$file->canRender()) return Null;
$properties = array('type' => 'sledrun', 'name' => $title->getText(), 'wiki' => $title->getLocalUrl());
if (!is_null($sledrun['date_report'])) $properties['date_report'] = $sledrun['date_report'];
if (!is_null($sledrun['condition'])) $properties['condition'] = intval($sledrun['condition']);
+ $image_url = WrBaseMap::wikipage_to_image($title, 150);
+ if (!is_null($image_url)) $properties['thumb_url'] = $image_url;
$json_feature = array(
'type' => 'feature',
'geometry' => array(
$xml = new SimpleXMLElement($input); // input
$whitespace = (string) $xml; // everything between <wrmap> and </wrmap> that's not a sub-element
if (strlen($whitespace) > 0 && !ctype_space($whitespace)) { // there must not be anythin except sub-elements or whitespace
- throw new Exception('Die Landkarte enthält folgenden ungültigen Text: "' . trim($xml) . '".');
+ throw new Exception(wfMessage('wrmap-error-invalid-text', trim($xml))->text());
}
$json_features = array(); // output
- $point_types = array('gasthaus', 'haltestelle', 'parkplatz', 'achtung', 'foto', 'punkt');
+ $point_types = array('gasthaus', 'haltestelle', 'parkplatz', 'achtung', 'foto', 'verleih', 'punkt');
$line_types = array('rodelbahn', 'gehweg', 'alternative', 'lift', 'anfahrt', 'linie');
foreach ($xml as $feature) {
$given_properties = array();
$is_point = in_array($feature->getName(), $point_types);
$is_line = in_array($feature->getName(), $line_types);
if (!$is_point && !$is_line) {
- throw new Exception('Unbekanntes Element <' . $feature->getName() . '>. Erlaubt sind: <' . implode('>, <', array_merge($point_types, $line_types)) . '>.');
+ throw new Exception(wfMessage('wrmap-error-invalid-element', $feature->getName(), '<' . implode('>, <', array_merge($point_types, $line_types)) . '>')->text());
}
// point
$properties = array('type' => $feature->getName());
$allowed_properties = array('name', 'wiki');
$wrong_properties = array_diff($given_properties, $allowed_properties);
- if (count($wrong_properties) > 0) throw new Exception("Das Attribut '" . reset($wrong_properties) . "' ist nicht erlaubt bei <" . $feature->getName() . ">. Erlaubt sind: '" . implode("', '", $allowed_properties) . "'.");
+ if (count($wrong_properties) > 0) throw new Exception(wfMessage('wrmap-error-invalid-attribute', reset($wrong_properties), $feature->getName(), "'" . implode("', '", $allowed_properties) . "'")->text());
foreach ($given_properties as $property) {
$propval = (string) $feature[$property];
if ($property == 'wiki') {
$title = Title::newFromText($propval);
$propval = $title->getLocalUrl();
- $file_url = WrBaseMap::wikipage_to_image($title, 300);
+ $file_url = WrBaseMap::wikipage_to_image($title, 200);
if (!is_null($file_url)) $properties['thumb_url'] = $file_url;
}
$properties[$property] = $propval;
}
$coordinates = WrBaseMap::geo_to_coordinates($feature);
- if (count($coordinates) != 1) throw new Exception('Das Element <' . $feature->getName() . '> muss genau ein Koordinatenpaar haben.');
+ if (count($coordinates) != 1) throw new Exception(wfMessage('wrmap-error-coordinate-count', $feature->getName())->text());
$json_feature = array(
'type' => 'feature',
'geometry' => array(
$properties = array('type' => $feature->getName());
$allowed_properties = array('farbe', 'dicke');
$wrong_properties = array_diff($given_properties, $allowed_properties);
- if (count($wrong_properties) > 0) throw new Exception("Das Attribut '" . reset($wrong_properties) . "' ist nicht erlaubt bei <" . $feature->getName() . ">. Erlaubt sind: '" . implode("', '", $allowed_properties) . "'.");
+ if (count($wrong_properties) > 0) throw new Exception(wfMessage('wrmap-error-invalid-attribute', reset($wrong_properties), $feature->getName(), "'" . implode("', '", $allowed_properties) . "'")->text());
if (isset($feature['farbe'])) {
$color = (string) $feature['farbe']; // e.g. #a200b7
if (preg_match('/^#[0-9a-f]{6}$/i', $color) != 1)
- throw new Exception('Die Farbangabe der Linie hat ein falsches Format. Sie muss z.B. so aussehen: #a200b7.');
+ throw new Exception(wfMessage('wrmap-error-line-color')->text());
$properties['strokeColor'] = $color;
}
if (isset($feature['dicke'])) {
$stroke_width = (int) $feature['dicke']; // e.g. 6
if (((string) $stroke_width) !== (string) $feature['dicke'])
- throw new Exception('Die Angabe der Liniendicke hat ein falsches Format. Sie muss eine ganze Zahl wie z.B. 6 sein.');
+ throw new Exception(wfMessage('wrmap-error-line-width')->text());
$properties['strokeWidth'] = $stroke_width;
}
$json_feature = array(
assert(in_array($tagname, array('wrmap', 'wrgmap')));
$parserOutput = $parser->getOutput();
- $parserOutput->addHeadItem('<script type="text/javascript" src="http://maps.google.com/maps/api/js?v=3.8&sensor=false"></script>', 'googlemaps');
+ // $parserOutput->addHeadItem('<script type="text/javascript" src="http://maps.google.com/maps/api/js?v=3.8&sensor=false"></script>', 'googlemaps');
$parserOutput->addModules('ext.wrmap');
// append all sledruns as icon
// Create <div/> element where the map is placed in
global $wgExtensionAssetsPath;
$doc = new WrMapDOMDocument();
- $div = $doc->appendElement('div', array('class' => 'wrmap', 'style' => 'border-style:none;', 'data-img-path' => "$wgExtensionAssetsPath/wrmap/openlayers/img/"));
+ $div = $doc->appendElement('div', array('class' => 'wrmap', 'style' => 'border-style:none;', 'data-ext-path' => "$wgExtensionAssetsPath/wrmap"));
// progress message
- $div->appendElement('div', array())->appendText('Die Landkarte wird geladen...');
+ $div->appendElement('div', array())->appendText(wfMessage('wrmap-loading')->text());
// data
$div->appendElement('div', array('style' => 'height: 0px; display:none;'))->appendText($json_string);
return array($doc->saveHTML($div), 'markerType' => 'nowiki');
}
+
+
+ public static function onEnableMobileModules($out, $mode) {
+ $out->addModules('ext.wrmap.mobile');
+ return true;
+ }
}
ToastFreeware / philipp / winterrodeln / mediawiki_extensions / wrmap.git / blobdiff