fixed images

This commit is contained in:
Fedor Katurov 2021-04-08 14:15:09 +07:00
parent 1eefa0ebbc
commit 3109f49cc4
14 changed files with 22 additions and 16 deletions

5
public/images/arrow.svg Normal file
View file

@ -0,0 +1,5 @@
<svg width="48" height="48" xmlns="http://www.w3.org/2000/svg">
<g id="path-arrow" transform="scale(2) translate(5 -2)">
<path d="m 2.625,3.375 h 7.5 L 10.28125,1.609375 13.5,4.25 10.484375,6.921875 10.171875,5.15625 2.625,5.125 Z" fill="#ff3344" fillRule="evenodd" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 297 B

BIN
public/images/logos/jw.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 KiB

BIN
public/images/logos/lgo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 94 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

View file

@ -4,13 +4,13 @@ export interface ILogos {
export const LOGOS = {
default: ['Без лого', null, 'bottom-right'],
nvs: ['НВС', require('../sprites/logos/lgo.png'), 'bottom-right'],
pinmix: ['Пин-Микс', require('../sprites/logos/pin-mix.png'), 'top-right'],
jolly: ['Пин-Микс + JW', require('../sprites/logos/jw.png'), 'top-right'],
pedals: ['Усталые Педальки', require('../sprites/logos/pedals.png'), 'bottom-right'],
rider: ['Райдер', require('../sprites/logos/rider.png'), 'bottom-right'],
rider_evening: ['Вечерние городские', require('../sprites/logos/rider_evening.png'), 'top-right'],
prokatimsya: ['PRO_КАТИМСЯ?!', require('../sprites/logos/prokatimsya.png'), 'top-right'],
nvs: ['НВС', '/images/logos/lgo.png', 'bottom-right'],
pinmix: ['Пин-Микс', '/images/logos/pin-mix.png', 'top-right'],
jolly: ['Пин-Микс + JW', '/images/logos/jw.png', 'top-right'],
pedals: ['Усталые Педальки', '/images/logos/pedals.png', 'bottom-right'],
rider: ['Райдер', '/images/logos/rider.png', 'bottom-right'],
rider_evening: ['Вечерние городские', '/images/logos/rider_evening.png', 'top-right'],
prokatimsya: ['PRO_КАТИМСЯ?!', '/images/logos/prokatimsya.png', 'top-right'],
};
export const DEFAULT_LOGO = 'nvs';

View file

@ -37,7 +37,7 @@ export interface IStickers {
export const STICKERS: IStickers = {
base: {
title: 'Простые',
url: require('~/sprites/stickers/stickers-base.svg'),
url: '/images/stickers-base.svg',
size: 72,
layers: {
men: { off: 5, title: 'Александр 3', title_long: 'Парк Городское Начало' },
@ -69,7 +69,7 @@ export const STICKERS: IStickers = {
},
real: {
title: 'Реалистичные',
url: require('~/sprites/stickers/stickers-base.svg'),
url: '/images/stickers-base.svg',
size: 72,
layers: {
chicken: { off: 31, title: 'Курочка', title_long: 'Курочка' },
@ -84,7 +84,7 @@ export const STICKERS: IStickers = {
},
pin: {
title: 'ПИН-микс',
url: require('~/sprites/stickers/stickers-base.svg'),
url: '/images/stickers-base.svg',
size: 72,
layers: {
start: { off: 21, title: '1', title_long: 'Первая точка' },
@ -101,7 +101,7 @@ export const STICKERS: IStickers = {
},
points: {
title: 'Точки',
url: require('~/sprites/stickers/stickers-base.svg'),
url: '/images/stickers-base.svg',
size: 72,
layers: {
pt1: { off: 40, title: '1', title_long: 'Первая точка' },

View file

@ -1,6 +1,6 @@
import { divIcon, LatLngLiteral, Marker, marker, DivIcon } from 'leaflet';
import { divIcon, DivIcon, LatLngLiteral, Marker } from 'leaflet';
const arrow_image = require('~/sprites/arrow.svg');
const arrow_image = '/images/arrow.svg';
export const createArrowIcon = (angle: number) =>
divIcon({

View file

@ -1,9 +1,10 @@
import { divIcon, LatLngLiteral, Layer, LayerGroup, Map, marker, Marker } from 'leaflet';
import { divIcon, LatLngLiteral, LayerGroup, Map, marker, Marker } from 'leaflet';
import { arrowClusterIcon } from '~/utils/arrow';
import { MarkerClusterGroup } from 'leaflet.markercluster/dist/leaflet.markercluster-src.js';
import { allwaysPositiveAngleDeg, angleBetweenPoints, distKmHaversine } from '~/utils/geom';
import classNames from 'classnames';
const arrow_image = require('~/sprites/arrow.svg');
const arrow_image = '/images/arrow.svg';
interface KmMarksOptions {
showStartMarker: boolean;

View file

@ -231,7 +231,7 @@ export const composeArrows = async ({
points: Point[];
ctx: CanvasRenderingContext2D;
}): Promise<boolean[]> => {
const image = await imageFetcher(require('~/sprites/arrow.svg'));
const image = await imageFetcher('/images/arrow.svg');
const distances = points.map(
(point, i) => (points[i + 1] && findDistancePx(points[i], points[i + 1])) || 0